juju-core

Merge lp:~dave-cheney/juju-core/182-fix-lp-1322018 into lp:~go-bot/juju-core/trunk

  1. 182-fix-lp-1322018
  2. Merge into trunk
Proposed by Dave Cheney
Status: Merged
Approved by: Dave Cheney
Approved revision: no longer in the source branch.
Merged at revision: 2767
Proposed branch: lp:~dave-cheney/juju-core/182-fix-lp-1322018
Merge into: lp:~go-bot/juju-core/trunk
Diff against target: 21 lines (+2/-2)
1 file modified
provider/maas/environ_whitebox_test.go (+2/-2)
To merge this branch: bzr merge lp:~dave-cheney/juju-core/182-fix-lp-1322018
Reviewer Review Type Date Requested Status
Juju Engineering Pending
Review via email: mp+220565@code.launchpad.net

Commit message

provider/maas: fix lp 1322018

Description of the change

provider/maas: fix lp 1322018

https://codereview.appspot.com/94710045/

To post a comment you must log in.
Revision history for this message
Dave Cheney (dave-cheney) wrote :

Reviewers: mp+220565_code.launchpad.net,

Message:
Please take a look.

Description:
provider/maas: fix lp 1322018

https://code.launchpad.net/~dave-cheney/juju-core/182-fix-lp-1322018/+merge/220565

(do not edit description out of merge proposal)

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

Affected files (+4, -2 lines):
   A [revision details]
   M provider/maas/environ_whitebox_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-20140522050027-49ughajngzek0zl5
+New revision: <email address hidden>

Index: provider/maas/environ_whitebox_test.go
=== modified file 'provider/maas/environ_whitebox_test.go'
--- provider/maas/environ_whitebox_test.go 2014-05-19 08:16:18 +0000
+++ provider/maas/environ_whitebox_test.go 2014-05-22 05:34:00 +0000
@@ -603,7 +603,7 @@
   env := suite.makeEnviron()
   a, err := env.SupportedArchitectures()
   c.Assert(err, gc.IsNil)
- c.Assert(a, gc.DeepEquals, []string{"amd64"})
+ c.Assert(a, jc.SameContents, []string{"amd64"})
  }

  func (suite *environSuite) TestConstraintsValidator(c *gc.C) {
@@ -614,7 +614,7 @@
   cons := constraints.MustParse("arch=amd64 cpu-power=10 instance-type=foo")
   unsupported, err := validator.Validate(cons)
   c.Assert(err, gc.IsNil)
- c.Assert(unsupported, gc.DeepEquals,
[]string{"cpu-power", "instance-type"})
+ c.Assert(unsupported, jc.SameContents,
[]string{"cpu-power", "instance-type"})
  }

  func (suite *environSuite) TestConstraintsValidatorVocab(c *gc.C) {

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

On 2014/05/22 05:35:56, dfc wrote:
> Please take a look.

LGTM

https://codereview.appspot.com/94710045/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'provider/maas/environ_whitebox_test.go'
2--- provider/maas/environ_whitebox_test.go 2014-05-19 08:16:18 +0000
3+++ provider/maas/environ_whitebox_test.go 2014-05-22 05:35:41 +0000
4@@ -603,7 +603,7 @@
5 env := suite.makeEnviron()
6 a, err := env.SupportedArchitectures()
7 c.Assert(err, gc.IsNil)
8- c.Assert(a, gc.DeepEquals, []string{"amd64"})
9+ c.Assert(a, jc.SameContents, []string{"amd64"})
10 }
11
12 func (suite *environSuite) TestConstraintsValidator(c *gc.C) {
13@@ -614,7 +614,7 @@
14 cons := constraints.MustParse("arch=amd64 cpu-power=10 instance-type=foo")
15 unsupported, err := validator.Validate(cons)
16 c.Assert(err, gc.IsNil)
17- c.Assert(unsupported, gc.DeepEquals, []string{"cpu-power", "instance-type"})
18+ c.Assert(unsupported, jc.SameContents, []string{"cpu-power", "instance-type"})
19 }
20
21 func (suite *environSuite) TestConstraintsValidatorVocab(c *gc.C) {

Subscribers

People subscribed via source and target branches

to status/vote changes: