Merge lp:~wallyworld/juju-core/joyent-gccgo-test-failure into lp:~go-bot/juju-core/trunk

Proposed by Ian Booth
Status: Merged
Approved by: Ian Booth
Approved revision: no longer in the source branch.
Merged at revision: 2780
Proposed branch: lp:~wallyworld/juju-core/joyent-gccgo-test-failure
Merge into: lp:~go-bot/juju-core/trunk
Diff against target: 12 lines (+1/-1)
1 file modified
provider/joyent/local_test.go (+1/-1)
To merge this branch: bzr merge lp:~wallyworld/juju-core/joyent-gccgo-test-failure
Reviewer Review Type Date Requested Status
Juju Engineering Pending
Review via email: mp+220743@code.launchpad.net

Commit message

Trivial joyent test fix for gccgo

Use SameContents not DeepEquals

https://codereview.appspot.com/97650046/

Description of the change

Trivial joyent test fix for gccgo

Use SameContents not DeepEquals

https://codereview.appspot.com/97650046/

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

Reviewers: mp+220743_code.launchpad.net,

Message:
Please take a look.

Description:
Trivial joyent test fix for gccgo

Use SameContents not DeepEquals

https://code.launchpad.net/~wallyworld/juju-core/joyent-gccgo-test-failure/+merge/220743

(do not edit description out of merge proposal)

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

Affected files (+3, -1 lines):
   A [revision details]
   M provider/joyent/local_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-20140523013529-f0gwneum0rsp1vfe
+New revision: <email address hidden>

Index: provider/joyent/local_test.go
=== modified file 'provider/joyent/local_test.go'
--- provider/joyent/local_test.go 2014-05-19 21:42:14 +0000
+++ provider/joyent/local_test.go 2014-05-23 03:55:47 +0000
@@ -422,7 +422,7 @@
   cons := constraints.MustParse("arch=amd64 tags=bar cpu-power=10")
   unsupported, err := validator.Validate(cons)
   c.Assert(err, gc.IsNil)
- c.Assert(unsupported, gc.DeepEquals, []string{"cpu-power", "tags"})
+ c.Assert(unsupported, jc.SameContents, []string{"cpu-power", "tags"})
  }

  func (s *localServerSuite) TestConstraintsValidatorVocab(c *gc.C) {

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

On 2014/05/23 03:57:36, wallyworld wrote:
> Please take a look.

LGTM

https://codereview.appspot.com/97650046/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'provider/joyent/local_test.go'
2--- provider/joyent/local_test.go 2014-05-19 21:42:14 +0000
3+++ provider/joyent/local_test.go 2014-05-23 04:07:16 +0000
4@@ -422,7 +422,7 @@
5 cons := constraints.MustParse("arch=amd64 tags=bar cpu-power=10")
6 unsupported, err := validator.Validate(cons)
7 c.Assert(err, gc.IsNil)
8- c.Assert(unsupported, gc.DeepEquals, []string{"cpu-power", "tags"})
9+ c.Assert(unsupported, jc.SameContents, []string{"cpu-power", "tags"})
10 }
11
12 func (s *localServerSuite) TestConstraintsValidatorVocab(c *gc.C) {

Subscribers

People subscribed via source and target branches

to status/vote changes: