environs/ec2: bootstrap

environs/ec2/suite_test.go

 package ec2_test
 
 import (
         "flag"
-        . "launchpad.net/gocheck"
         "launchpad.net/juju-core/environs/ec2"
         "launchpad.net/juju-core/log"
-        "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) {

[niemeyer, 2012/07/06 19:44:56]

logDebug := log.Debug
defer func() { log.Debug = logDebug }()

[dfc, 2012/07/09 00:52:58]

Done.

         log.Debug = true
         if *regenerate {
                 ec2.RegenerateImages(t)
         }
         if *amazon {
                 registerAmazonTests()
         }
         registerLocalTests()
-        TestingT(t)
+        coretesting.ZkTestPackage(t)

[niemeyer, 2012/07/06 19:44:56]

It seems like multiple changes to the test harness could be reverted back to the
original state. Would you mind to do a self-review on the CL and see which of
these changes are really necessary for the tests being put in place in this CL?

[dfc, 2012/07/09 00:52:58]

Using ZkTestPackage isn't necessary if we do not try to mock a provisioning
agent. I have reverted this change.

 }