Merge lp:~dave-cheney/juju-core/127-fix-lp-1305397 into lp:~go-bot/juju-core/trunk
Proposed by
Dave Cheney
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Dave Cheney | ||||
Approved revision: | no longer in the source branch. | ||||
Merged at revision: | 2611 | ||||
Proposed branch: | lp:~dave-cheney/juju-core/127-fix-lp-1305397 | ||||
Merge into: | lp:~go-bot/juju-core/trunk | ||||
Diff against target: |
28 lines (+4/-2) 1 file modified
provider/common/supportedarchitectures_test.go (+4/-2) |
||||
To merge this branch: | bzr merge lp:~dave-cheney/juju-core/127-fix-lp-1305397 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Juju Engineering | Pending | ||
Review via email: mp+215077@code.launchpad.net |
Commit message
Fix lp 1305397
Description of the change
Fix lp 1305397
To post a comment you must log in.
Reviewers: mp+215077_ code.launchpad. net,
Message:
Please take a look.
Description:
Fix lp 1305397
https:/ /code.launchpad .net/~dave- cheney/ juju-core/ 127-fix- lp-1305397/ +merge/ 215077
(do not edit description out of merge proposal)
Please review this at https:/ /codereview. appspot. com/86380043/
Affected files (+6, -2 lines): common/ supportedarchit ectures_ test.go
A [revision details]
M provider/
Index: [revision details] 20140410030400- 08uxo6g9uxj4dey 3
=== 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/ common/ supportedarchit ectures_ test.go common/ supportedarchit ectures_ test.go' common/ supportedarchit ectures_ test.go 2014-03-20 03:21:18 +0000 common/ supportedarchit ectures_ test.go 2014-04-10 05:25:17 +0000 net/gocheck"
=== modified file 'provider/
--- provider/
+++ provider/
@@ -6,6 +6,8 @@
import (
gc "launchpad.
+ jc "github. com/juju/ testing/ checkers" net/juju- core/environs" net/juju- core/environs/ imagemetadata" net/juju- core/environs/ simplestreams" SupportedArchit ectures( env, imageConstraint)
+
"launchpad.
"launchpad.
"launchpad.
@@ -69,7 +71,7 @@
})
arches, err := common.
c.Assert(err, gc.IsNil)
- c.Assert(arches, gc.DeepEquals, []string{"ppc64"})
+ c.Assert(arches, jc.SameContents, []string{"ppc64"})
}
func (s *archSuite) TestSupportedAr chitecturesMany (c *gc.C) { SupportedArchit ectures( env, imageConstraint)
@@ -79,5 +81,5 @@
})
arches, err := common.
c.Assert(err, gc.IsNil)
- c.Assert(arches, gc.DeepEquals, []string{"amd64", "ppc64"})
+ c.Assert(arches, jc.SameContents, []string{"amd64", "ppc64"})
}