environs/ec2: enable local ec2 provisioner tests

environs/ec2/suite_test.go

Index: environs/ec2/suite_test.go
=== modified file 'environs/ec2/suite_test.go'
--- environs/ec2/suite_test.go	2012-07-10 00:12:25 +0000
+++ environs/ec2/suite_test.go	2012-07-11 02:46:47 +0000
@@ -2,15 +2,15 @@
 
 import (
 	"flag"
-	. "launchpad.net/gocheck"
 	"launchpad.net/juju-core/environs/ec2"
-	"testing"
+	coretesting "launchpad.net/juju-core/testing"
+	stdtesting "testing"
 )
 
 var regenerate = flag.Bool("regenerate-images", false, "regenerate all data in images directory")
 var amazon = flag.Bool("amazon", false, "Also run some tests on live Amazon servers")
 
-func TestEC2(t *testing.T) {
+func TestEC2(t *stdtesting.T) {
 	if *regenerate {
 		ec2.RegenerateImages(t)
 	}
@@ -18,5 +18,5 @@
 		registerAmazonTests()
 	}
 	registerLocalTests()
-	TestingT(t)
+	coretesting.ZkTestPackage(t)
 }