Code review comment for lp://staging/~wallyworld/juju-core/ec2-live-tests-fix

Revision history for this message
Ian Booth (wallyworld) wrote :

Reviewers: mp+160004_code.launchpad.net,

Message:
Please take a look.

Description:
Fix EC2 live tests - use correct series

When setting up the environment for running live tests on EC2, no
default
series was specified. This meant that "precise" was used as a fallback
to start
the bootstrap node. But later on, test asserts were being done with
version.CurrentSeries(),
which in my case was "raring" since I'm running on the latest Ubuntu. So
the tests failed.

I've tweaked the live test setup for EC2 to explicitly specify
default-series as
version.Current(). I think this makes sense, since I'd prefer we use the
series from the
current running Ubuntu when testing. If we want to test with "precise" I
think that's best
done as part of setting up the landing bot.

https://code.launchpad.net/~wallyworld/juju-core/ec2-live-tests-fix/+merge/160004

(do not edit description out of merge proposal)

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

Affected files:
   A [revision details]
   M environs/ec2/live_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:
<email address hidden>
+New revision: <email address hidden>

Index: environs/ec2/live_test.go
=== modified file 'environs/ec2/live_test.go'
--- environs/ec2/live_test.go 2013-04-10 00:11:24 +0000
+++ environs/ec2/live_test.go 2013-04-22 04:38:01 +0000
@@ -16,6 +16,7 @@
   "launchpad.net/juju-core/juju/testing"
   "launchpad.net/juju-core/state"
   coretesting "launchpad.net/juju-core/testing"
+ "launchpad.net/juju-core/version"
   "strings"
  )

@@ -46,6 +47,7 @@
    "control-bucket": "juju-test-" + uniqueName,
    "public-bucket": "juju-public-test-" + uniqueName,
    "admin-secret": "for real",
+ "default-series": version.CurrentSeries(),
    "ca-cert": coretesting.CACert,
    "ca-private-key": coretesting.CAKey,
   }

« Back to merge proposal