juju-core

Merge lp:~wallyworld/juju-core/fix-fake-tools-trusty-2 into lp:juju-core/1.18

  1. fix-fake-tools-trusty-2
  2. Merge into 1.18
Proposed by Ian Booth
Status: Merged
Approved by: Ian Booth
Approved revision: no longer in the source branch.
Merged at revision: 2292
Proposed branch: lp:~wallyworld/juju-core/fix-fake-tools-trusty-2
Merge into: lp:juju-core/1.18
Diff against target: 53 lines (+9/-9)
2 files modified
environs/bootstrap/synctools.go (+3/-2)
environs/testing/tools.go (+6/-7)
To merge this branch: bzr merge lp:~wallyworld/juju-core/fix-fake-tools-trusty-2
Reviewer Review Type Date Requested Status
Juju Engineering Pending
Review via email: mp+219273@code.launchpad.net

Commit message

Another attempt to fix tools tests

A first attempt to ensure the required fake
tools were uploaded for tests failed.
This rework uses a cleaner approach - the
ToolsLtsSeries slice from environs/bootstrap
is used to determine what tools to upload.

https://codereview.appspot.com/97160044/

Description of the change

Another attempt to fix tools tests

A first attempt to ensure the required fake
tools were uploaded for tests failed.
This rework uses a cleaner approach - the
ToolsLtsSeries slice from environs/bootstrap
is used to determine what tools to upload.

https://codereview.appspot.com/97160044/

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

Reviewers: mp+219273_code.launchpad.net,

Message:
Please take a look.

Description:
Another attempt to fix tools tests

A first attempt to ensure the required fake
tools were uploaded for tests failed.
This rework uses a cleaner approach - the
ToolsLtsSeries slice from environs/bootstrap
is used to determine what tools to upload.

https://code.launchpad.net/~wallyworld/juju-core/fix-fake-tools-trusty-2/+merge/219273

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/97160044/

Affected files (+11, -9 lines):
   A [revision details]
   M environs/bootstrap/synctools.go
   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-20140512035456-e3volksqn5lj2pb0
+New revision: <email address hidden>

Index: environs/bootstrap/synctools.go
=== modified file 'environs/bootstrap/synctools.go'
--- environs/bootstrap/synctools.go 2014-05-12 02:21:07 +0000
+++ environs/bootstrap/synctools.go 2014-05-12 23:15:28 +0000
@@ -94,7 +94,8 @@

  // Unless otherwise specified, we will upload tools for all lts series on
bootstrap
  // when --upload-tools is used.
-var toolsLtsSeries = []string{"precise", "trusty"}
+// ToolsLtsSeries records the known lts series.
+var ToolsLtsSeries = []string{"precise", "trusty"}

  // SeriesToUpload returns the supplied series with duplicates removed if
  // non-empty; otherwise it returns a default list of series we should
@@ -103,7 +104,7 @@
   unique := set.NewStrings(series...)
   if unique.IsEmpty() {
    unique.Add(version.Current.Series)
- for _, toolsSeries := range toolsLtsSeries {
+ for _, toolsSeries := range ToolsLtsSeries {
     unique.Add(toolsSeries)
    }
    if series, ok := cfg.DefaultSeries(); ok {

Index: environs/testing/tools.go
=== modified file 'environs/testing/tools.go'
--- environs/testing/tools.go 2014-05-12 03:31:03 +0000
+++ environs/testing/tools.go 2014-05-12 23:15:28 +0000
@@ -13,7 +13,7 @@

   agenttools "launchpad.net/juju-core/agent/tools"
   "launchpad.net/juju-core/environs"
- "launchpad.net/juju-core/environs/config"
+ "launchpad.net/juju-core/environs/bootstrap"
   "launchpad.net/juju-core/environs/simplestreams"
   "launchpad.net/juju-core/environs/storage"
   envtools "launchpad.net/juju-core/environs/tools"
@@ -161,12 +161,11 @@
  }

  func uploadFakeTools(stor storage.Storage) error {
- versions := []version.Binary{version.Current}
- toolsVersion := version.Current
- latestLts := config.LatestLtsSeries()
- if toolsVersion.Series != latestLts {
- toolsVersion.Series = latestLts
- versions = append(versions, toolsVersion)
+ var versions []version.Binary
+ for _, series := range bootstrap.ToolsLtsSeries {
+ vers := version.Current
+ vers.Series = series
+ versions = append(versions, vers)
   }
   if _, err := UploadFakeToolsVersions(stor, versions...); err != nil {
    return err

Revision history for this message
Andrew Wilkins (axwalk) wrote :

On 2014/05/12 23:25:37, wallyworld wrote:
> Please take a look.

LGTM

https://codereview.appspot.com/97160044/

Revision history for this message
Go Bot (go-bot) wrote :
Download full text (560.2 KiB)

The attempt to merge lp:~wallyworld/juju-core/fix-fake-tools-trusty-2 into lp:juju-core/1.18 failed. Below is the output from the failed tests.

ok launchpad.net/juju-core 0.013s
ok launchpad.net/juju-core/agent 1.030s
ok launchpad.net/juju-core/agent/mongo 0.547s
ok launchpad.net/juju-core/agent/tools 0.151s
ok launchpad.net/juju-core/bzr 4.620s
ok launchpad.net/juju-core/cert 2.179s
ok launchpad.net/juju-core/charm 0.382s
? launchpad.net/juju-core/charm/hooks [no test files]
? launchpad.net/juju-core/charm/testing [no test files]
ok launchpad.net/juju-core/cloudinit 0.025s
ok launchpad.net/juju-core/cloudinit/sshinit 0.779s
ok launchpad.net/juju-core/cmd 0.185s
ok launchpad.net/juju-core/cmd/charm-admin 0.709s
? launchpad.net/juju-core/cmd/charmd [no test files]
? launchpad.net/juju-core/cmd/charmload [no test files]
ok launchpad.net/juju-core/cmd/envcmd 0.165s
ok launchpad.net/juju-core/cmd/juju 208.241s
ok launchpad.net/juju-core/cmd/jujud 64.545s
ok launchpad.net/juju-core/cmd/plugins/juju-metadata 11.175s
? launchpad.net/juju-core/cmd/plugins/juju-restore [no test files]
ok launchpad.net/juju-core/cmd/plugins/local 0.207s
? launchpad.net/juju-core/cmd/plugins/local/juju-local [no test files]
ok launchpad.net/juju-core/constraints 0.027s
ok launchpad.net/juju-core/container 0.048s
ok launchpad.net/juju-core/container/factory 0.039s
ok launchpad.net/juju-core/container/kvm 0.222s
ok launchpad.net/juju-core/container/kvm/mock 0.044s
? launchpad.net/juju-core/container/kvm/testing [no test files]
ok launchpad.net/juju-core/container/lxc 4.331s
? launchpad.net/juju-core/container/lxc/mock [no test files]
? launchpad.net/juju-core/container/lxc/testing [no test files]
? launchpad.net/juju-core/container/testing [no test files]
ok launchpad.net/juju-core/downloader 5.326s
ok launchpad.net/juju-core/environs 2.334s
ok launchpad.net/juju-core/environs/bootstrap 10.823s
ok launchpad.net/juju-core/environs/cloudinit 0.537s
ok launchpad.net/juju-core/environs/config 2.034s
ok launchpad.net/juju-core/environs/configstore 0.031s
ok launchpad.net/juju-core/environs/filestorage 0.032s
ok launchpad.net/juju-core/environs/httpstorage 0.665s
ok launchpad.net/juju-core/environs/imagemetadata 0.401s
? launchpad.net/juju-core/environs/imagemetadata/testing [no test files]
ok launchpad.net/juju-core/environs/instances 0.044s
ok launchpad.net/juju-core/environs/jujutest 0.167s
ok launchpad.net/juju-core/environs/manual 9.990s
ok launchpad.net/juju-core/environs/simplestreams 0.243s
? launchpad.net/juju-core/environs/simplestreams/testing [no test files]
ok launchpad.net/juju-core/environs/sshstorage 0.826s
ok launchpad.net/juju-core/environs/storage 0.901s
ok launchpad.net/juju-core/environs/sync 43.971s
ok launchpad.net/juju-core/environs/testing 0.153s
ok launchpad.net/juju-core/environs/tools 4.330s
? launchpad.net/juju-core/environs/tools/testing [no test files]
ok launchpad.net/juju-core/errors 0.011s
ok launchpad.net/juju-core/instance 0.017s
? launchpad.net/juju-core/instance/testing [no test files]
ok launchpad.net/juju-core/j...

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'environs/bootstrap/synctools.go'
2--- environs/bootstrap/synctools.go 2014-05-12 02:21:07 +0000
3+++ environs/bootstrap/synctools.go 2014-05-12 23:25:29 +0000
4@@ -94,7 +94,8 @@
5
6 // Unless otherwise specified, we will upload tools for all lts series on bootstrap
7 // when --upload-tools is used.
8-var toolsLtsSeries = []string{"precise", "trusty"}
9+// ToolsLtsSeries records the known lts series.
10+var ToolsLtsSeries = []string{"precise", "trusty"}
11
12 // SeriesToUpload returns the supplied series with duplicates removed if
13 // non-empty; otherwise it returns a default list of series we should
14@@ -103,7 +104,7 @@
15 unique := set.NewStrings(series...)
16 if unique.IsEmpty() {
17 unique.Add(version.Current.Series)
18- for _, toolsSeries := range toolsLtsSeries {
19+ for _, toolsSeries := range ToolsLtsSeries {
20 unique.Add(toolsSeries)
21 }
22 if series, ok := cfg.DefaultSeries(); ok {
23
24=== modified file 'environs/testing/tools.go'
25--- environs/testing/tools.go 2014-05-12 03:31:03 +0000
26+++ environs/testing/tools.go 2014-05-12 23:25:29 +0000
27@@ -13,7 +13,7 @@
28
29 agenttools "launchpad.net/juju-core/agent/tools"
30 "launchpad.net/juju-core/environs"
31- "launchpad.net/juju-core/environs/config"
32+ "launchpad.net/juju-core/environs/bootstrap"
33 "launchpad.net/juju-core/environs/simplestreams"
34 "launchpad.net/juju-core/environs/storage"
35 envtools "launchpad.net/juju-core/environs/tools"
36@@ -161,12 +161,11 @@
37 }
38
39 func uploadFakeTools(stor storage.Storage) error {
40- versions := []version.Binary{version.Current}
41- toolsVersion := version.Current
42- latestLts := config.LatestLtsSeries()
43- if toolsVersion.Series != latestLts {
44- toolsVersion.Series = latestLts
45- versions = append(versions, toolsVersion)
46+ var versions []version.Binary
47+ for _, series := range bootstrap.ToolsLtsSeries {
48+ vers := version.Current
49+ vers.Series = series
50+ versions = append(versions, vers)
51 }
52 if _, err := UploadFakeToolsVersions(stor, versions...); err != nil {
53 return err

Subscribers

People subscribed via source and target branches

to all changes: