Merge lp:~dave-cheney/juju-core/127-fix-lp-1305397 into lp:~go-bot/juju-core/trunk

[Dave Cheney]

Fix lp 1305397

https://codereview.appspot.com/86380043/

Fix lp 1305397

https://codereview.appspot.com/86380043/

[Dave Cheney (dave-cheney)]

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):
   A [revision details]
   M provider/common/supportedarchitectures_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-20140410030400-08uxo6g9uxj4dey3
+New revision: <email address hidden>

Index: provider/common/supportedarchitectures_test.go
=== modified file 'provider/common/supportedarchitectures_test.go'
--- provider/common/supportedarchitectures_test.go 2014-03-20 03:21:18 +0000
+++ provider/common/supportedarchitectures_test.go 2014-04-10 05:25:17 +0000
@@ -6,6 +6,8 @@
  import (
   gc "launchpad.net/gocheck"

+ jc "github.com/juju/testing/checkers"
+
   "launchpad.net/juju-core/environs"
   "launchpad.net/juju-core/environs/imagemetadata"
   "launchpad.net/juju-core/environs/simplestreams"
@@ -69,7 +71,7 @@
   })
   arches, err := common.SupportedArchitectures(env, imageConstraint)
   c.Assert(err, gc.IsNil)
- c.Assert(arches, gc.DeepEquals, []string{"ppc64"})
+ c.Assert(arches, jc.SameContents, []string{"ppc64"})
  }

  func (s *archSuite) TestSupportedArchitecturesMany(c *gc.C) {
@@ -79,5 +81,5 @@
   })
   arches, err := common.SupportedArchitectures(env, imageConstraint)
   c.Assert(err, gc.IsNil)
- c.Assert(arches, gc.DeepEquals, []string{"amd64", "ppc64"})
+ c.Assert(arches, jc.SameContents, []string{"amd64", "ppc64"})
  }

[Go Bot (go-bot)]

The attempt to merge lp:~dave-cheney/juju-core/127-fix-lp-1305397 into lp:juju-core failed. Below is the output from the failed tests.

ok launchpad.net/juju-core 0.014s
ok launchpad.net/juju-core/agent 1.626s
ok launchpad.net/juju-core/agent/mongo 1.170s
ok launchpad.net/juju-core/agent/tools 0.209s
ok launchpad.net/juju-core/bzr 5.166s
ok launchpad.net/juju-core/cert 2.658s
ok launchpad.net/juju-core/charm 0.353s
? launchpad.net/juju-core/charm/hooks [no test files]
? launchpad.net/juju-core/charm/testing [no test files]
ok launchpad.net/juju-core/cloudinit 0.029s
ok launchpad.net/juju-core/cloudinit/sshinit 0.758s
ok launchpad.net/juju-core/cmd 0.210s
ok launchpad.net/juju-core/cmd/charm-admin 0.708s
? launchpad.net/juju-core/cmd/charmd [no test files]
? launchpad.net/juju-core/cmd/charmload [no test files]
ok launchpad.net/juju-core/cmd/envcmd 0.176s
ok launchpad.net/juju-core/cmd/juju 219.783s
ok launchpad.net/juju-core/cmd/jujud 77.643s
ok launchpad.net/juju-core/cmd/plugins/juju-metadata 7.747s
? launchpad.net/juju-core/cmd/plugins/juju-restore [no test files]
ok launchpad.net/juju-core/cmd/plugins/local 0.186s
? launchpad.net/juju-core/cmd/plugins/local/juju-local [no test files]
ok launchpad.net/juju-core/constraints 0.019s
ok launchpad.net/juju-core/container 0.038s
ok launchpad.net/juju-core/container/factory 0.035s
ok launchpad.net/juju-core/container/kvm 0.214s
ok launchpad.net/juju-core/container/kvm/mock 0.039s
? launchpad.net/juju-core/container/kvm/testing [no test files]
ok launchpad.net/juju-core/container/lxc 4.301s
? launchpad.net/juju-core/container/lxc/mock [no test files]
? launchpad.net/juju-core/container/lxc/testing [no test files]
? launchpad.net/juju-core/container/testing [no test files]
ok launchpad.net/juju-core/downloader 5.265s
ok launchpad.net/juju-core/environs 2.336s
ok launchpad.net/juju-core/environs/bootstrap 11.533s
ok launchpad.net/juju-core/environs/cloudinit 0.453s
ok launchpad.net/juju-core/environs/config 2.691s
ok launchpad.net/juju-core/environs/configstore 0.030s
ok launchpad.net/juju-core/environs/filestorage 0.027s
ok launchpad.net/juju-core/environs/httpstorage 0.719s
ok launchpad.net/juju-core/environs/imagemetadata 0.401s
? launchpad.net/juju-core/environs/imagemetadata/testing [no test files]
ok launchpad.net/juju-core/environs/instances 0.041s
ok launchpad.net/juju-core/environs/jujutest 0.173s
ok launchpad.net/juju-core/environs/manual 14.137s
ok launchpad.net/juju-core/environs/simplestreams 0.277s
? launchpad.net/juju-core/environs/simplestreams/testing [no test files]
ok launchpad.net/juju-core/environs/sshstorage 0.940s
ok launchpad.net/juju-core/environs/storage 0.851s
ok launchpad.net/juju-core/environs/sync 49.404s
ok launchpad.net/juju-core/environs/testing 0.119s
ok launchpad.net/juju-core/environs/tools 4.434s
? launchpad.net/juju-core/environs/tools/testing [no test files]
ok launchpad.net/juju-core/errors 0.011s
ok launchpad.net/juju-core/instance 0.018s
? launchpad.net/juju-core/instance/testing [no test files]
ok launchpad.net/juju-core/juju 18.77...

=== modified file 'provider/common/supportedarchitectures_test.go'
--- provider/common/supportedarchitectures_test.go	2014-03-20 03:21:18 +0000
+++ provider/common/supportedarchitectures_test.go	2014-04-10 05:27:59 +0000
@@ -6,6 +6,8 @@
 import (
 	gc "launchpad.net/gocheck"
 
+	jc "github.com/juju/testing/checkers"
+
 	"launchpad.net/juju-core/environs"
 	"launchpad.net/juju-core/environs/imagemetadata"
 	"launchpad.net/juju-core/environs/simplestreams"
@@ -69,7 +71,7 @@
 	})
 	arches, err := common.SupportedArchitectures(env, imageConstraint)
 	c.Assert(err, gc.IsNil)
-	c.Assert(arches, gc.DeepEquals, []string{"ppc64"})
+	c.Assert(arches, jc.SameContents, []string{"ppc64"})
 }
 
 func (s *archSuite) TestSupportedArchitecturesMany(c *gc.C) {
@@ -79,5 +81,5 @@
 	})
 	arches, err := common.SupportedArchitectures(env, imageConstraint)
 	c.Assert(err, gc.IsNil)
-	c.Assert(arches, gc.DeepEquals, []string{"amd64", "ppc64"})
+	c.Assert(arches, jc.SameContents, []string{"amd64", "ppc64"})
 }