juju-core

Merge lp:~wallyworld/juju-core/fix-utopic-tools-tests into lp:~go-bot/juju-core/trunk

  1. fix-utopic-tools-tests
  2. Merge into trunk
Proposed by Ian Booth
Status: Merged
Approved by: Ian Booth
Approved revision: no longer in the source branch.
Merged at revision: 2816
Proposed branch: lp:~wallyworld/juju-core/fix-utopic-tools-tests
Merge into: lp:~go-bot/juju-core/trunk
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
Reviewer Review Type Date Requested Status
Juju Engineering Pending
Review via email: mp+221655@code.launchpad.net

Commit message

Fix unit tests on Utopic

Fix uploadFakeTools so that current series as well
as lts series are uploaded.

https://codereview.appspot.com/102920049/

Description of the change

Fix unit tests on Utopic

Fix uploadFakeTools so that current series as well
as lts series are uploaded.

https://codereview.appspot.com/102920049/

To post a comment you must log in.
Revision history for this message
Ian Booth (wallyworld) wrote :

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/~wallyworld/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):
   A [revision details]
   M environs/testing/tools.go

Index: [revision details]
=== 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-20140530163551-b1m9k0br0iaxwqim
+New revision: <email address hidden>

Index: environs/testing/tools.go
=== modified file 'environs/testing/tools.go'
--- environs/testing/tools.go 2014-05-27 01:32:17 +0000
+++ environs/testing/tools.go 2014-06-02 02:40:18 +0000
@@ -21,6 +21,7 @@
   coretesting "launchpad.net/juju-core/testing"
   coretools "launchpad.net/juju-core/tools"
   "launchpad.net/juju-core/utils"
+ "launchpad.net/juju-core/utils/set"
   "launchpad.net/juju-core/version"
   "launchpad.net/juju-core/worker/upgrader"
  )
@@ -185,8 +186,10 @@
  }

  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)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'environs/testing/tools.go'
2--- environs/testing/tools.go 2014-05-27 01:32:17 +0000
3+++ environs/testing/tools.go 2014-06-02 02:52:52 +0000
4@@ -21,6 +21,7 @@
5 coretesting "launchpad.net/juju-core/testing"
6 coretools "launchpad.net/juju-core/tools"
7 "launchpad.net/juju-core/utils"
8+ "launchpad.net/juju-core/utils/set"
9 "launchpad.net/juju-core/version"
10 "launchpad.net/juju-core/worker/upgrader"
11 )
12@@ -185,8 +186,10 @@
13 }
14
15 func uploadFakeTools(stor storage.Storage) error {
16+ toolsSeries := set.NewStrings(bootstrap.ToolsLtsSeries...)
17+ toolsSeries.Add(version.Current.Series)
18 var versions []version.Binary
19- for _, series := range bootstrap.ToolsLtsSeries {
20+ for _, series := range toolsSeries.Values() {
21 vers := version.Current
22 vers.Series = series
23 versions = append(versions, vers)

Subscribers

People subscribed via source and target branches

to status/vote changes: