func uploadFakeTools(stor storage.Storage) error {
+ toolsSeries := set.NewStrings(bootstrap.ToolsLtsSeries...)
+ toolsSeries.Add(version.Current.Series)
var versions []version.Binary
- for _, series := range bootstrap.ToolsLtsSeries {
+ for _, series := range toolsSeries.Values() {
vers := version.Current
vers.Series = series
versions = append(versions, vers)
Reviewers: mp+221655_ code.launchpad. net,
Message:
Please take a look.
Description:
Fix unit tests on Utopic
Fix uploadFakeTools so that current series as well
as lts series are uploaded.
https:/ /code.launchpad .net/~wallyworl d/juju- core/fix- utopic- tools-tests/ +merge/ 221655
(do not edit description out of merge proposal)
Please review this at https:/ /codereview. appspot. com/102920049/
Affected files (+6, -1 lines): testing/ tools.go
A [revision details]
M environs/
Index: [revision details] 20140530163551- b1m9k0br0iaxwqi m
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: tarmac-
+New revision: <email address hidden>
Index: environs/ testing/ tools.go testing/ tools.go' testing/ tools.go 2014-05-27 01:32:17 +0000 testing/ tools.go 2014-06-02 02:40:18 +0000 net/juju- core/testing" net/juju- core/tools" net/juju- core/utils" net/juju- core/utils/ set" net/juju- core/version" net/juju- core/worker/ upgrader"
=== modified file 'environs/
--- environs/
+++ environs/
@@ -21,6 +21,7 @@
coretesting "launchpad.
coretools "launchpad.
"launchpad.
+ "launchpad.
"launchpad.
"launchpad.
)
@@ -185,8 +186,10 @@
}
func uploadFakeTools (stor storage.Storage) error { bootstrap. ToolsLtsSeries. ..) Add(version. Current. Series) ToolsLtsSeries { Values( ) {
+ toolsSeries := set.NewStrings(
+ toolsSeries.
var versions []version.Binary
- for _, series := range bootstrap.
+ for _, series := range toolsSeries.
vers := version.Current
vers.Series = series
versions = append(versions, vers)