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 | ||||
Related bugs: |
|
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
Description of the change
Trivial joyent test fix for gccgo
Use SameContents not DeepEquals
To post a comment you must log in.
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/~wallyworl d/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): joyent/ local_test. go
A [revision details]
M provider/
Index: [revision details] 20140523013529- f0gwneum0rsp1vf e
=== 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-
+New revision: <email address hidden>
Index: provider/ joyent/ local_test. go joyent/ local_test. go' joyent/ local_test. go 2014-05-19 21:42:14 +0000 joyent/ local_test. go 2014-05-23 03:55:47 +0000 MustParse( "arch=amd64 tags=bar cpu-power=10") Validate( cons) unsupported, gc.DeepEquals, []string{ "cpu-power" , "tags"}) unsupported, jc.SameContents, []string{ "cpu-power" , "tags"})
=== modified file 'provider/
--- provider/
+++ provider/
@@ -422,7 +422,7 @@
cons := constraints.
unsupported, err := validator.
c.Assert(err, gc.IsNil)
- c.Assert(
+ c.Assert(
}
func (s *localServerSuite) TestConstraints ValidatorVocab( c *gc.C) {