← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~julian-edwards/juju-core/fix-build into lp:~maas-maintainers/juju-core/maas-provider-skeleton

 

Julian Edwards has proposed merging lp:~julian-edwards/juju-core/fix-build into lp:~maas-maintainers/juju-core/maas-provider-skeleton.

Commit message:
Fix broken tests.

Requested reviews:
  MAAS Maintainers (maas-maintainers)

For more details, see:
https://code.launchpad.net/~julian-edwards/juju-core/fix-build/+merge/158518

We've been living with broken tests since r904.  The way in which cloudinit was being tested has changed so I re-added a missing import.  I also removed test.check since I don't think it's really useful - besides, it doesn't exist any more :)
-- 
https://code.launchpad.net/~julian-edwards/juju-core/fix-build/+merge/158518
Your team MAAS Maintainers is requested to review the proposed merge of lp:~julian-edwards/juju-core/fix-build into lp:~maas-maintainers/juju-core/maas-provider-skeleton.
=== modified file 'environs/cloudinit/cloudinit_test.go'
--- environs/cloudinit/cloudinit_test.go	2013-04-11 08:01:25 +0000
+++ environs/cloudinit/cloudinit_test.go	2013-04-12 02:27:26 +0000
@@ -4,6 +4,7 @@
 	"encoding/base64"
 	. "launchpad.net/gocheck"
 	"launchpad.net/goyaml"
+	cloudinit_core "launchpad.net/juju-core/cloudinit"
 	"launchpad.net/juju-core/constraints"
 	"launchpad.net/juju-core/environs/cloudinit"
 	"launchpad.net/juju-core/environs/config"
@@ -210,8 +211,6 @@
 		ci, err := cloudinit.Configure(&test.cfg, cloudcfg)
 		c.Assert(err, IsNil)
 		c.Check(ci, NotNil)
-
-		test.check(c)
 	}
 }