Merge lp:~dave-cheney/juju-core/101-lp-1152202 into lp:~juju/juju-core/trunk

[Dave Cheney]

environs/jujutest: always sort during checkList

Fix LP#1152202 by sorting the arrays to compare inside checkList. This is a temporary fix until I can get an SliceEquals checker added to gocheck.

https://codereview.appspot.com/7551046/

[Dimiter Naydenov (dimitern)]

Thanks, LGTM! Very nice, we definitely need this in gocheck!

https://codereview.appspot.com/7551046/

[William Reade (fwereade)]

LGTM

https://codereview.appspot.com/7551046/

=== modified file 'environs/jujutest/tests.go'
--- environs/jujutest/tests.go	2013-03-07 15:06:37 +0000
+++ environs/jujutest/tests.go	2013-03-08 22:27:21 +0000
@@ -11,6 +11,7 @@
 	coretesting "launchpad.net/juju-core/testing"
 	"launchpad.net/juju-core/trivial"
 	"net/http"
+	"sort"
 )
 
 // Tests is a gocheck suite containing tests verifying juju functionality
@@ -186,7 +187,19 @@
 func checkList(c *C, storage environs.StorageReader, prefix string, names []string) {
 	lnames, err := storage.List(prefix)
 	c.Assert(err, IsNil)
-	c.Assert(lnames, DeepEquals, names)
+	// TODO(dfc) gocheck should grow an SliceEquals checker.
+	expected := copyslice(lnames)
+	sort.Strings(expected)
+	actual := copyslice(names)
+	sort.Strings(actual)
+	c.Assert(expected, DeepEquals, actual)
+}
+
+// copyslice returns a copy of the slice
+func copyslice(s []string) []string {
+	r := make([]string, len(s))
+	copy(r, s)
+	return r
 }
 
 func checkPutFile(c *C, storage environs.StorageWriter, name string, contents []byte) {