Merge lp:~sinzui/juju-core/add-trusty-series into lp:~go-bot/juju-core/trunk

[Curtis Hovey]

Add trusty to seriesVersions.

Added Ubuntu trusty to the seriesVersions that Juju supports.
Updated a test to pass when the machine running the test suite gets
an updated ubuntu.csv.

https://codereview.appspot.com/15120043/

Add trusty to seriesVersions.

Added Ubuntu trusty to the seriesVersions that Juju supports.
Updated a test to pass when the machine running the test suite gets
an updated ubuntu.csv.

https://codereview.appspot.com/15120043/

[Curtis Hovey (sinzui)]

Reviewers: mp+191844_code.launchpad.net,

Message:
Please take a look.

Description:
Add trusty to seriesVersions.

Added Ubuntu trusty to the seriesVersions that Juju supports.
Updated a test to pass when the machine running the test suite gets
an updated ubuntu.csv.

RULES

     Pre-implementation: mgz
     * Add trusty to seriesVersions so that non-ubuntu machines, or those
       with old ubuntu.csv files can work with tools for trusty.
     * I added tarty to ubuntu.csv and discovered TestSupportedSeries
assumes
       it knows the series in ubuntu.csv on the host machine. The test
need
       to only check for what it knows about
     * This branch needs to go into trunk and 1.16 so that we can
release.

https://code.launchpad.net/~sinzui/juju-core/add-trusty-series/+merge/191844

(do not edit description out of merge proposal)

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

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

Index: environs/simplestreams/simplestreams.go
=== modified file 'environs/simplestreams/simplestreams.go'
--- environs/simplestreams/simplestreams.go 2013-10-18 03:10:07 +0000
+++ environs/simplestreams/simplestreams.go 2013-10-18 17:12:57 +0000
@@ -80,6 +80,7 @@
   "quantal": "12.10",
   "raring": "13.04",
   "saucy": "13.10",
+ "trusty": "14.04",
  }

  var (

Index: environs/simplestreams/simplestreams_test.go
=== modified file 'environs/simplestreams/simplestreams_test.go'
--- environs/simplestreams/simplestreams_test.go 2013-10-10 11:40:54 +0000
+++ environs/simplestreams/simplestreams_test.go 2013-10-18 17:12:57 +0000
@@ -350,6 +350,7 @@
   cleanup := simplestreams.SetSeriesVersions(make(map[string]string))
   defer cleanup()
   series := simplestreams.SupportedSeries()
+ series = series[0:4]
   c.Assert(series, gc.DeepEquals,
[]string{"precise", "quantal", "raring", "saucy"})
  }

[Martin Packman (gz)]

LGTM.

https://codereview.appspot.com/15120043/diff/1/environs/simplestreams/simplestreams_test.go
File environs/simplestreams/simplestreams_test.go (right):

https://codereview.appspot.com/15120043/diff/1/environs/simplestreams/simplestreams_test.go#newcode353
environs/simplestreams/simplestreams_test.go:353: series = series[0:4]
So, this test won't fail when new series are picked up from distro-info,
good.

https://codereview.appspot.com/15120043/

[Curtis Hovey (sinzui)]

Approved above

review: Approve (code)

[Dave Cheney (dave-cheney)]

LGTM.

On Sat, Oct 19, 2013 at 8:02 AM, Curtis Hovey <email address hidden> wrote:
> Review: Approve code
>
> Approved above
> --
> https://code.launchpad.net/~sinzui/juju-core/add-trusty-series/+merge/191844
> You are subscribed to branch lp:juju-core.

=== modified file 'environs/simplestreams/simplestreams.go'
--- environs/simplestreams/simplestreams.go	2013-10-18 03:10:07 +0000
+++ environs/simplestreams/simplestreams.go	2013-10-18 17:29:05 +0000
@@ -80,6 +80,7 @@
 	"quantal": "12.10",
 	"raring":  "13.04",
 	"saucy":   "13.10",
+	"trusty":  "14.04",
 }
 
 var (

=== modified file 'environs/simplestreams/simplestreams_test.go'
--- environs/simplestreams/simplestreams_test.go	2013-10-10 11:40:54 +0000
+++ environs/simplestreams/simplestreams_test.go	2013-10-18 17:29:05 +0000
@@ -350,6 +350,7 @@
 	cleanup := simplestreams.SetSeriesVersions(make(map[string]string))
 	defer cleanup()
 	series := simplestreams.SupportedSeries()
+	series = series[0:4]
 	c.Assert(series, gc.DeepEquals, []string{"precise", "quantal", "raring", "saucy"})
 }