Merge lp:~dave-cheney/juju-core/167-simplestreams-add-trusty into lp:~go-bot/juju-core/trunk

Proposed by Dave Cheney on 2014-02-11
Status: Merged
Approved by: Martin Packman on 2014-02-13
Approved revision: 2310
Merged at revision: 2321
Proposed branch: lp:~dave-cheney/juju-core/167-simplestreams-add-trusty
Merge into: lp:~go-bot/juju-core/trunk
Diff against target: 47 lines (+7/-4)
3 files modified
environs/simplestreams/simplestreams.go (+2/-2)
environs/simplestreams/simplestreams_test.go (+2/-2)
testing/constants.go (+3/-0)
To merge this branch: bzr merge lp:~dave-cheney/juju-core/167-simplestreams-add-trusty
Reviewer Review Type Date Requested Status
Juju Engineering 2014-02-11 Pending
Review via email: mp+205684@code.launchpad.net

Commit message

simplestreams: add trusty

Lost in the various commit messages was a desire to consolidate the list of
supported series. This proposal is the first of several.

Description of the change

To post a comment you must log in.
Dave Cheney (dave-cheney) wrote :

Reviewers: mp+205684_code.launchpad.net,

Message:
Please take a look.

Description:
simplestreams: add trusty

https://code.launchpad.net/~dave-cheney/juju-core/167-simplestreams-add-trusty/+merge/205684

(do not edit description out of merge proposal)

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

Affected files (+9, -4 lines):
   A [revision details]
   M environs/simplestreams/simplestreams.go
   M environs/simplestreams/simplestreams_test.go
   M testing/constants.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-20140210142230-bs4gcvlb7cjb3tig
+New revision: <email address hidden>

Index: testing/constants.go
=== modified file 'testing/constants.go'
--- testing/constants.go 2013-07-30 16:36:03 +0000
+++ testing/constants.go 2014-02-11 03:40:13 +0000
@@ -25,3 +25,6 @@
   Total: LongWait,
   Delay: ShortWait,
  }
+
+// SupportedSeries lists the series known to Juju.
+var SupportedSeries =
[]string{"precise", "quantal", "raring", "saucy", "trusty"}

Index: environs/simplestreams/simplestreams.go
=== modified file 'environs/simplestreams/simplestreams.go'
--- environs/simplestreams/simplestreams.go 2014-01-29 09:58:08 +0000
+++ environs/simplestreams/simplestreams.go 2014-02-11 03:40:13 +0000
@@ -127,8 +127,8 @@
   seriesVersionsMutex.Lock()
   defer seriesVersionsMutex.Unlock()
   updateSeriesVersions()
- series := []string{}
- for s, _ := range seriesVersions {
+ var series []string
+ for s := range seriesVersions {
    series = append(series, s)
   }
   return series

Index: environs/simplestreams/simplestreams_test.go
=== modified file 'environs/simplestreams/simplestreams_test.go'
--- environs/simplestreams/simplestreams_test.go 2013-11-26 12:24:48 +0000
+++ environs/simplestreams/simplestreams_test.go 2014-02-11 03:40:13 +0000
@@ -13,6 +13,7 @@

   "launchpad.net/juju-core/environs/simplestreams"
   sstesting "launchpad.net/juju-core/environs/simplestreams/testing"
+ coretesting "launchpad.net/juju-core/testing"
   jc "launchpad.net/juju-core/testing/checkers"
  )

@@ -411,8 +412,7 @@
   defer cleanup()
   series := simplestreams.SupportedSeries()
   sort.Strings(series)
- series = series[0:4]
- c.Assert(series, gc.DeepEquals,
[]string{"precise", "quantal", "raring", "saucy"})
+ c.Assert(series, gc.DeepEquals, coretesting.SupportedSeries)
  }

  var getMirrorTests = []struct {

Dave Cheney (dave-cheney) wrote :

Lost in the various commit messages was a desire to consolidate the list of
supported series. This proposal is the first of several.

On Tue, Feb 11, 2014 at 2:51 PM, <email address hidden> wrote:

> Reviewers: mp+205684_code.launchpad.net,
>
> Message:
> Please take a look.
>
> Description:
> simplestreams: add trusty
>
>
>
> https://code.launchpad.net/~dave-cheney/juju-core/167-
> simplestreams-add-trusty/+merge/205684
>
> (do not edit description out of merge proposal)
>
>
> Please review this at https://codereview.appspot.com/61560045/
>
> Affected files (+9, -4 lines):
> A [revision details]
> M environs/simplestreams/simplestreams.go
> M environs/simplestreams/simplestreams_test.go
> M testing/constants.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-20140210142230-bs4gcvlb7cjb3tig
> +New revision: <email address hidden>
>
> Index: testing/constants.go
> === modified file 'testing/constants.go'
> --- testing/constants.go 2013-07-30 16:36:03 +0000
> +++ testing/constants.go 2014-02-11 03:40:13 +0000
> @@ -25,3 +25,6 @@
> Total: LongWait,
> Delay: ShortWait,
> }
> +
> +// SupportedSeries lists the series known to Juju.
> +var SupportedSeries = []string{"precise", "quantal", "raring", "saucy",
> "trusty"}
>
>
> Index: environs/simplestreams/simplestreams.go
> === modified file 'environs/simplestreams/simplestreams.go'
> --- environs/simplestreams/simplestreams.go 2014-01-29 09:58:08 +0000
> +++ environs/simplestreams/simplestreams.go 2014-02-11 03:40:13 +0000
> @@ -127,8 +127,8 @@
> seriesVersionsMutex.Lock()
> defer seriesVersionsMutex.Unlock()
> updateSeriesVersions()
> - series := []string{}
> - for s, _ := range seriesVersions {
> + var series []string
> + for s := range seriesVersions {
> series = append(series, s)
> }
> return series
>
>
> Index: environs/simplestreams/simplestreams_test.go
> === modified file 'environs/simplestreams/simplestreams_test.go'
> --- environs/simplestreams/simplestreams_test.go 2013-11-26
> 12:24:48 +0000
> +++ environs/simplestreams/simplestreams_test.go 2014-02-11
> 03:40:13 +0000
> @@ -13,6 +13,7 @@
>
> "launchpad.net/juju-core/environs/simplestreams"
> sstesting "launchpad.net/juju-core/environs/simplestreams/testing"
> + coretesting "launchpad.net/juju-core/testing"
> jc "launchpad.net/juju-core/testing/checkers"
> )
>
> @@ -411,8 +412,7 @@
> defer cleanup()
> series := simplestreams.SupportedSeries()
> sort.Strings(series)
> - series = series[0:4]
> - c.Assert(series, gc.DeepEquals, []string{"precise", "quantal",
> "raring", "saucy"})
> + c.Assert(series, gc.DeepEquals, coretesting.SupportedSeries)
> }
>
> var getMirrorTests = []struct {
>
>
>
>
>

Andrew Wilkins (axwalk) wrote :
Download full text (3.5 KiB)

On 2014/02/11 04:02:03, dfc wrote:
> Lost in the various commit messages was a desire to consolidate the
list of
> supported series. This proposal is the first of several.

> On Tue, Feb 11, 2014 at 2:51 PM, <mailto:<email address hidden>> wrote:

> > Reviewers: http://mp+205684_code.launchpad.net,
> >
> > Message:
> > Please take a look.
> >
> > Description:
> > simplestreams: add trusty
> >
> >
> >
> > https://code.launchpad.net/~dave-cheney/juju-core/167-
> > simplestreams-add-trusty/+merge/205684
> >
> > (do not edit description out of merge proposal)
> >
> >
> > Please review this at https://codereview.appspot.com/61560045/
> >
> > Affected files (+9, -4 lines):
> > A [revision details]
> > M environs/simplestreams/simplestreams.go
> > M environs/simplestreams/simplestreams_test.go
> > M testing/constants.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-20140210142230-bs4gcvlb7cjb3tig
> > +New revision:
mailto:<email address hidden>
> >
> > Index: testing/constants.go
> > === modified file 'testing/constants.go'
> > --- testing/constants.go 2013-07-30 16:36:03 +0000
> > +++ testing/constants.go 2014-02-11 03:40:13 +0000
> > @@ -25,3 +25,6 @@
> > Total: LongWait,
> > Delay: ShortWait,
> > }
> > +
> > +// SupportedSeries lists the series known to Juju.
> > +var SupportedSeries = []string{"precise", "quantal", "raring",
"saucy",
> > "trusty"}
> >
> >
> > Index: environs/simplestreams/simplestreams.go
> > === modified file 'environs/simplestreams/simplestreams.go'
> > --- environs/simplestreams/simplestreams.go 2014-01-29 09:58:08
+0000
> > +++ environs/simplestreams/simplestreams.go 2014-02-11 03:40:13
+0000
> > @@ -127,8 +127,8 @@
> > seriesVersionsMutex.Lock()
> > defer seriesVersionsMutex.Unlock()
> > updateSeriesVersions()
> > - series := []string{}
> > - for s, _ := range seriesVersions {
> > + var series []string
> > + for s := range seriesVersions {
> > series = append(series, s)
> > }
> > return series
> >
> >
> > Index: environs/simplestreams/simplestreams_test.go
> > === modified file 'environs/simplestreams/simplestreams_test.go'
> > --- environs/simplestreams/simplestreams_test.go 2013-11-26
> > 12:24:48 +0000
> > +++ environs/simplestreams/simplestreams_test.go 2014-02-11
> > 03:40:13 +0000
> > @@ -13,6 +13,7 @@
> >
> > "launchpad.net/juju-core/environs/simplestreams"
> > sstesting
"launchpad.net/juju-core/environs/simplestreams/testing"
> > + coretesting "launchpad.net/juju-core/testing"
> > jc "launchpad.net/juju-core/testing/checkers"
> > )
> >
> > @@ -411,8 +412,7 @@
> > defer cleanup()
> > series := simplestreams.SupportedSeries()
> > sort.Strings(series)
> > - series = series[0:4]
> > - c.Assert(series, gc.DeepEquals, []string{"precise",
"quantal",
> > "raring", "saucy"})
> > + c.Assert(series, gc.De...

Read more...

Go Bot (go-bot) wrote :
Download full text (9.3 KiB)

The attempt to merge lp:~dave-cheney/juju-core/167-simplestreams-add-trusty into lp:juju-core failed. Below is the output from the failed tests.

ok launchpad.net/juju-core 0.015s
ok launchpad.net/juju-core/agent 0.659s
ok launchpad.net/juju-core/agent/tools 0.211s
ok launchpad.net/juju-core/bzr 6.781s
ok launchpad.net/juju-core/cert 3.407s
ok launchpad.net/juju-core/charm 0.531s
? 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.047s
ok launchpad.net/juju-core/cloudinit/sshinit 1.123s
ok launchpad.net/juju-core/cmd 0.224s
ok launchpad.net/juju-core/cmd/charm-admin 0.840s
? launchpad.net/juju-core/cmd/charmd [no test files]
? launchpad.net/juju-core/cmd/charmload [no test files]
ok launchpad.net/juju-core/cmd/juju 241.684s
ok launchpad.net/juju-core/cmd/jujud 61.775s
ok launchpad.net/juju-core/cmd/plugins/juju-metadata 8.494s
? launchpad.net/juju-core/cmd/plugins/juju-restore [no test files]
ok launchpad.net/juju-core/constraints 0.026s
ok launchpad.net/juju-core/container 0.037s
ok launchpad.net/juju-core/container/factory 0.051s
ok launchpad.net/juju-core/container/kvm 0.302s
ok launchpad.net/juju-core/container/kvm/mock 0.037s
? launchpad.net/juju-core/container/kvm/testing [no test files]
ok launchpad.net/juju-core/container/lxc 0.264s
? 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.291s
ok launchpad.net/juju-core/environs 3.256s
ok launchpad.net/juju-core/environs/bootstrap 4.614s
ok launchpad.net/juju-core/environs/cloudinit 0.625s
ok launchpad.net/juju-core/environs/config 3.122s
ok launchpad.net/juju-core/environs/configstore 0.056s
ok launchpad.net/juju-core/environs/filestorage 0.032s
ok launchpad.net/juju-core/environs/httpstorage 1.037s
ok launchpad.net/juju-core/environs/imagemetadata 0.727s
? launchpad.net/juju-core/environs/imagemetadata/testing [no test files]
ok launchpad.net/juju-core/environs/instances 0.060s
ok launchpad.net/juju-core/environs/jujutest 0.274s
ok launchpad.net/juju-core/environs/manual 10.874s

----------------------------------------------------------------------
FAIL: simplestreams_test.go:410: simplestreamsSuite.TestSupportedSeries

simplestreams_test.go:415:
    c.Assert(series, gc.DeepEquals, coretesting.SupportedSeries)
... obtained []string = []string{"precise", "quantal", "raring", "saucy"}
... expected []string = []string{"precise", "quantal", "raring", "saucy", "trusty"}

OOPS: 45 passed, 1 FAILED
--- FAIL: Test (0.10 seconds)
FAIL
FAIL launchpad.net/juju-core/environs/simplestreams 0.346s
? launchpad.net/juju-core/environs/simplestreams/testing [no test files]
ok launchpad.net/juju-core/environs/sshstorage 1.093s
ok launchpad.net/juju-core/environs/storage 1.182s
ok launchpad.net/juju-core/environs/sync 34.013s
ok launchpad.net/juju-core/environs/testing 0.235s
ok launchpad.net/juju-core/environs/tools 6.950s
? launchpad...

Read more...

Go Bot (go-bot) wrote :
Download full text (9.3 KiB)

The attempt to merge lp:~dave-cheney/juju-core/167-simplestreams-add-trusty into lp:juju-core failed. Below is the output from the failed tests.

ok launchpad.net/juju-core 0.015s
ok launchpad.net/juju-core/agent 0.745s
ok launchpad.net/juju-core/agent/tools 0.258s
ok launchpad.net/juju-core/bzr 6.647s
ok launchpad.net/juju-core/cert 2.919s
ok launchpad.net/juju-core/charm 0.550s
? 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.036s
ok launchpad.net/juju-core/cloudinit/sshinit 1.202s
ok launchpad.net/juju-core/cmd 0.194s
ok launchpad.net/juju-core/cmd/charm-admin 0.838s
? launchpad.net/juju-core/cmd/charmd [no test files]
? launchpad.net/juju-core/cmd/charmload [no test files]
ok launchpad.net/juju-core/cmd/juju 238.181s
ok launchpad.net/juju-core/cmd/jujud 60.964s
ok launchpad.net/juju-core/cmd/plugins/juju-metadata 13.590s
? launchpad.net/juju-core/cmd/plugins/juju-restore [no test files]
ok launchpad.net/juju-core/constraints 0.028s
ok launchpad.net/juju-core/container 0.039s
ok launchpad.net/juju-core/container/factory 0.053s
ok launchpad.net/juju-core/container/kvm 0.284s
ok launchpad.net/juju-core/container/kvm/mock 0.039s
? launchpad.net/juju-core/container/kvm/testing [no test files]
ok launchpad.net/juju-core/container/lxc 0.326s
? 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.306s
ok launchpad.net/juju-core/environs 3.081s
ok launchpad.net/juju-core/environs/bootstrap 4.788s
ok launchpad.net/juju-core/environs/cloudinit 0.639s
ok launchpad.net/juju-core/environs/config 2.351s
ok launchpad.net/juju-core/environs/configstore 0.038s
ok launchpad.net/juju-core/environs/filestorage 0.031s
ok launchpad.net/juju-core/environs/httpstorage 0.879s
ok launchpad.net/juju-core/environs/imagemetadata 0.656s
? launchpad.net/juju-core/environs/imagemetadata/testing [no test files]
ok launchpad.net/juju-core/environs/instances 0.061s
ok launchpad.net/juju-core/environs/jujutest 0.228s
ok launchpad.net/juju-core/environs/manual 9.432s

----------------------------------------------------------------------
FAIL: simplestreams_test.go:410: simplestreamsSuite.TestSupportedSeries

simplestreams_test.go:415:
    c.Assert(series, gc.DeepEquals, coretesting.SupportedSeries)
... obtained []string = []string{"precise", "quantal", "raring", "saucy"}
... expected []string = []string{"precise", "quantal", "raring", "saucy", "trusty"}

OOPS: 45 passed, 1 FAILED
--- FAIL: Test (0.10 seconds)
FAIL
FAIL launchpad.net/juju-core/environs/simplestreams 0.335s
? launchpad.net/juju-core/environs/simplestreams/testing [no test files]
ok launchpad.net/juju-core/environs/sshstorage 1.236s
ok launchpad.net/juju-core/environs/storage 1.164s
ok launchpad.net/juju-core/environs/sync 33.312s
ok launchpad.net/juju-core/environs/testing 0.205s
ok launchpad.net/juju-core/environs/tools 6.840s
? launchpad...

Read more...

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'environs/simplestreams/simplestreams.go'
2--- environs/simplestreams/simplestreams.go 2014-01-29 09:58:08 +0000
3+++ environs/simplestreams/simplestreams.go 2014-02-11 03:50:53 +0000
4@@ -127,8 +127,8 @@
5 seriesVersionsMutex.Lock()
6 defer seriesVersionsMutex.Unlock()
7 updateSeriesVersions()
8- series := []string{}
9- for s, _ := range seriesVersions {
10+ var series []string
11+ for s := range seriesVersions {
12 series = append(series, s)
13 }
14 return series
15
16=== modified file 'environs/simplestreams/simplestreams_test.go'
17--- environs/simplestreams/simplestreams_test.go 2013-11-26 12:24:48 +0000
18+++ environs/simplestreams/simplestreams_test.go 2014-02-11 03:50:53 +0000
19@@ -13,6 +13,7 @@
20
21 "launchpad.net/juju-core/environs/simplestreams"
22 sstesting "launchpad.net/juju-core/environs/simplestreams/testing"
23+ coretesting "launchpad.net/juju-core/testing"
24 jc "launchpad.net/juju-core/testing/checkers"
25 )
26
27@@ -411,8 +412,7 @@
28 defer cleanup()
29 series := simplestreams.SupportedSeries()
30 sort.Strings(series)
31- series = series[0:4]
32- c.Assert(series, gc.DeepEquals, []string{"precise", "quantal", "raring", "saucy"})
33+ c.Assert(series, gc.DeepEquals, coretesting.SupportedSeries)
34 }
35
36 var getMirrorTests = []struct {
37
38=== modified file 'testing/constants.go'
39--- testing/constants.go 2013-07-30 16:36:03 +0000
40+++ testing/constants.go 2014-02-11 03:50:53 +0000
41@@ -25,3 +25,6 @@
42 Total: LongWait,
43 Delay: ShortWait,
44 }
45+
46+// SupportedSeries lists the series known to Juju.
47+var SupportedSeries = []string{"precise", "quantal", "raring", "saucy", "trusty"}

Subscribers

People subscribed via source and target branches

to status/vote changes: