Merge lp:~wallyworld/juju-core/fix-utopic-tools-tests-1.18 into lp:juju-core/1.18
Proposed by
Ian Booth
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Ian Booth | ||||
Approved revision: | no longer in the source branch. | ||||
Merged at revision: | 2295 | ||||
Proposed branch: | lp:~wallyworld/juju-core/fix-utopic-tools-tests-1.18 | ||||
Merge into: | lp:juju-core/1.18 | ||||
Diff against target: |
23 lines (+4/-1) 1 file modified
environs/testing/tools.go (+4/-1) |
||||
To merge this branch: | bzr merge lp:~wallyworld/juju-core/fix-utopic-tools-tests-1.18 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Juju Engineering | Pending | ||
Review via email: mp+221656@code.launchpad.net |
Commit message
Fix unit tests on utopic
Backport work to fix unit tests on utopic.
Description of the change
Fix unit tests on utopic
Backport work to fix unit tests on utopic.
To post a comment you must log in.
Reviewers: mp+221656_ code.launchpad. net,
Message:
Please take a look.
Description:
Fix unit tests on utopic
Backport work to fix unit tests on utopic.
https:/ /code.launchpad .net/~wallyworl d/juju- core/fix- utopic- tools-tests- 1.18/+merge/ 221656
(do not edit description out of merge proposal)
Please review this at https:/ /codereview. appspot. com/105750043/
Affected files (+6, -1 lines): testing/ tools.go
A [revision details]
M environs/
Index: [revision details] 20140522022123- xzgvgyngsmwhalu 4
=== 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-12 23:15:28 +0000 testing/ tools.go 2014-06-02 03:25:41 +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/
@@ -22,6 +22,7 @@
coretesting "launchpad.
coretools "launchpad.
"launchpad.
+ "launchpad.
"launchpad.
"launchpad.
)
@@ -161,8 +162,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)