Merge lp:~thumper/juju-core/testbase into lp:~go-bot/juju-core/trunk

[Tim Penhey]

Add a testbase package with no juju-core deps.

The base cleanup and logging suites are now there,
as are the patch functions.

A test also exists there to make sure that no juju-core
dependencies creep in.

https://codereview.appspot.com/13694046/

Add a testbase package with no juju-core deps.

The base cleanup and logging suites are now there,
as are the patch functions.

A test also exists there to make sure that no juju-core
dependencies creep in.

https://codereview.appspot.com/13694046/

[Tim Penhey (thumper)]

Reviewers: mp+186701_code.launchpad.net,

Message:
Please take a look.

Description:
Add a testbase package with no juju-core deps.

The base cleanup and logging suites are now there,
as are the patch functions.

A test also exists there to make sure that no juju-core
dependencies creep in.

https://code.launchpad.net/~thumper/juju-core/testbase/+merge/186701

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/13694046/

Affected files (+253, -174 lines):
   A [revision details]
   M agent/agent_test.go
   M agent/format-1.12_whitebox_test.go
   M agent/format-1.16_whitebox_test.go
   M agent/format_whitebox_test.go
   M agent/tools/diskmanager_test.go
   M agent/tools/tools_test.go
   M charm/dir_test.go
   M charm/repo_test.go
   M cmd/juju/bootstrap_test.go
   M cmd/juju/plugin_test.go
   M cmd/juju/publish_test.go
   M cmd/juju/synctools_test.go
   M cmd/jujud/agent_test.go
   M cmd/jujud/bootstrap_test.go
   M cmd/jujud/machine_test.go
   M cmd/logging_test.go
   M container/lxc/lxc_test.go
   M downloader/downloader_test.go
   M environs/bootstrap/bootstrap_test.go
   M environs/cert_internal_test.go
   M environs/cert_test.go
   M environs/cloudinit/cloudinit_test.go
   M environs/cloudinit_test.go
   M environs/config/config_test.go
   M environs/httpstorage/backend_test.go
   M environs/imagemetadata/validation_test.go
   M environs/instances/image_test.go
   M environs/instances/instancetype_test.go
   M environs/jujutest/livetests.go
   M environs/jujutest/tests.go
   M environs/manual/detection_test.go
   M environs/mongo_test.go
   M environs/simplestreams/testing/testing.go
   M environs/sshstorage/storage_test.go
   M environs/sync/sync_test.go
   M environs/tools/build_test.go
   M environs/tools/storage_test.go
   M environs/tools/tools_test.go
   M environs/tools/validation_test.go
   M instance/address_test.go
   M juju/apiconn_test.go
   M juju/conn_test.go
   M juju/osenv/package_test.go
   M juju/osenv/vars_linux_test.go
   M juju/osenv/vars_windows_test.go
   M juju/testing/conn.go
   M provider/azure/azure_test.go
   M provider/azure/config_test.go
   M provider/azure/customdata_test.go
   M provider/ec2/config_test.go
   M provider/ec2/image_test.go
   M provider/ec2/live_test.go
   M provider/ec2/local_test.go
   M provider/local/environprovider_test.go
   M provider/local/local_test.go
   M provider/local/prereqs_test.go
   M provider/maas/config_test.go
   M provider/maas/maas_test.go
   M provider/openstack/config_test.go
   M provider/openstack/live_test.go
   M provider/openstack/local_test.go
   M provider/state_test.go
   M rpc/jsoncodec/codec_test.go
   M rpc/rpc_test.go
   M state/apiserver/common/errors_test.go
   M state/conn_test.go
   M state/initialize_test.go
   M state/megawatcher_internal_test.go
   M state/multiwatcher/multiwatcher_internal_test.go
   M state/presence/presence_test.go
   M state/settings_test.go
   M state/watcher/watcher_test.go
   M store/store_test.go
   M testing/mgo_test.go
   M testing/testbase/cleanup.go
   M testing/testbase/cleanup_test.go
   M testing/testbase/imports.go
   M testing/testbase/log.go
   M testing/testbase/...

[Andrew Wilkins (axwalk)]

LGTM, just one question about dependencies.

https://codereview.appspot.com/13694046/diff/1/testing/testbase/package_test.go
File testing/testbase/package_test.go (right):

https://codereview.appspot.com/13694046/diff/1/testing/testbase/package_test.go#newcode23
testing/testbase/package_test.go:23: // This test is to ensure we don't
bring in any juju-core dependencies.
Glad to have this here. Is it okay for testbase to import
testing/checkers?

https://codereview.appspot.com/13694046/

=== modified file 'agent/agent_test.go'
--- agent/agent_test.go	2013-08-22 21:27:08 +0000
+++ agent/agent_test.go	2013-09-20 02:56:01 +0000
@@ -7,11 +7,11 @@
 	gc "launchpad.net/gocheck"
 
 	"launchpad.net/juju-core/agent"
-	coretesting "launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 type suite struct {
-	coretesting.LoggingSuite
+	testbase.LoggingSuite
 }
 
 var _ = gc.Suite(&suite{})
 
=== modified file 'agent/format-1.12_whitebox_test.go'
--- agent/format-1.12_whitebox_test.go	2013-09-02 04:08:52 +0000
+++ agent/format-1.12_whitebox_test.go	2013-09-20 02:56:01 +0000
@@ -9,12 +9,12 @@
 
 	gc "launchpad.net/gocheck"
 
-	"launchpad.net/juju-core/testing"
 	jc "launchpad.net/juju-core/testing/checkers"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 type format_1_12Suite struct {
-	testing.LoggingSuite
+	testbase.LoggingSuite
 	formatter formatter_1_12
 }
 
 
=== modified file 'agent/format-1.16_whitebox_test.go'
--- agent/format-1.16_whitebox_test.go	2013-09-19 02:17:33 +0000
+++ agent/format-1.16_whitebox_test.go	2013-09-20 02:56:01 +0000
@@ -14,12 +14,12 @@
 	gc "launchpad.net/gocheck"
 
 	"launchpad.net/juju-core/juju/osenv"
-	"launchpad.net/juju-core/testing"
 	jc "launchpad.net/juju-core/testing/checkers"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 type format_1_16Suite struct {
-	testing.LoggingSuite
+	testbase.LoggingSuite
 	formatter formatter_1_16
 }
 
 
=== modified file 'agent/format_whitebox_test.go'
--- agent/format_whitebox_test.go	2013-09-02 04:08:52 +0000
+++ agent/format_whitebox_test.go	2013-09-20 02:56:01 +0000
@@ -9,11 +9,11 @@
 
 	gc "launchpad.net/gocheck"
 
-	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 type formatSuite struct {
-	testing.LoggingSuite
+	testbase.LoggingSuite
 }
 
 var _ = gc.Suite(&formatSuite{})
 
=== modified file 'agent/tools/diskmanager_test.go'
--- agent/tools/diskmanager_test.go	2013-08-22 21:59:32 +0000
+++ agent/tools/diskmanager_test.go	2013-09-20 02:56:01 +0000
@@ -11,6 +11,7 @@
 
 	agenttools "launchpad.net/juju-core/agent/tools"
 	coretesting "launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 	coretools "launchpad.net/juju-core/tools"
 	"launchpad.net/juju-core/version"
 )
@@ -20,7 +21,7 @@
 var _ agenttools.ToolsManager = (*agenttools.DiskManager)(nil)
 
 type DiskManagerSuite struct {
-	coretesting.LoggingSuite
+	testbase.LoggingSuite
 	dataDir string
 	manager agenttools.ToolsManager
 }
 
=== modified file 'agent/tools/tools_test.go'
--- agent/tools/tools_test.go	2013-08-22 21:59:32 +0000
+++ agent/tools/tools_test.go	2013-09-20 02:56:01 +0000
@@ -14,12 +14,13 @@
 
 	agenttools "launchpad.net/juju-core/agent/tools"
 	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 	coretest "launchpad.net/juju-core/tools"
 	"launchpad.net/juju-core/version"
 )
 
 type ToolsSuite struct {
-	testing.LoggingSuite
+	testbase.LoggingSuite
 	dataDir string
 }
 
@@ -35,7 +36,7 @@
 	// or any of the other bigger packages that'll drag in yet more dependencies.
 	// Only imports that start with "launchpad.net/juju-core" are checked, and the
 	// resulting slice has that prefix removed to keep the output short.
-	c.Assert(testing.FindJujuCoreImports(c, "launchpad.net/juju-core/agent/tools"),
+	c.Assert(testbase.FindJujuCoreImports(c, "launchpad.net/juju-core/agent/tools"),
 		gc.DeepEquals,
 		[]string{"tools", "version"})
 }
 
=== modified file 'charm/dir_test.go'
--- charm/dir_test.go	2013-08-19 11:17:19 +0000
+++ charm/dir_test.go	2013-09-20 02:56:01 +0000
@@ -17,10 +17,11 @@
 
 	"launchpad.net/juju-core/charm"
 	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 type DirSuite struct {
-	testing.LoggingSuite
+	testbase.LoggingSuite
 }
 
 var _ = gc.Suite(&DirSuite{})
 
=== modified file 'charm/repo_test.go'
--- charm/repo_test.go	2013-08-19 11:17:19 +0000
+++ charm/repo_test.go	2013-09-20 02:56:01 +0000
@@ -20,6 +20,7 @@
 
 	"launchpad.net/juju-core/charm"
 	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 type MockStore struct {
@@ -151,7 +152,7 @@
 }
 
 type StoreSuite struct {
-	testing.LoggingSuite
+	testbase.LoggingSuite
 	server      *MockStore
 	store       *charm.CharmStore
 	oldCacheDir string
@@ -172,7 +173,7 @@
 	s.server.downloads = nil
 }
 
-// Uses the TearDownTest from testing.LoggingSuite
+// Uses the TearDownTest from testbase.LoggingSuite
 
 func (s *StoreSuite) TearDownSuite(c *gc.C) {
 	charm.CacheDir = s.oldCacheDir
@@ -392,7 +393,7 @@
 }
 
 type LocalRepoSuite struct {
-	testing.LoggingSuite
+	testbase.LoggingSuite
 	repo       *charm.LocalRepository
 	seriesPath string
 }
 
=== modified file 'cmd/juju/bootstrap_test.go'
--- cmd/juju/bootstrap_test.go	2013-09-20 00:52:13 +0000
+++ cmd/juju/bootstrap_test.go	2013-09-20 02:56:01 +0000
@@ -23,12 +23,13 @@
 	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/provider/dummy"
 	coretesting "launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 	coretools "launchpad.net/juju-core/tools"
 	"launchpad.net/juju-core/version"
 )
 
 type BootstrapSuite struct {
-	coretesting.LoggingSuite
+	testbase.LoggingSuite
 	coretesting.MgoSuite
 	envtesting.ToolsFixture
 }
 
=== modified file 'cmd/juju/plugin_test.go'
--- cmd/juju/plugin_test.go	2013-09-13 14:48:13 +0000
+++ cmd/juju/plugin_test.go	2013-09-20 02:56:01 +0000
@@ -15,10 +15,11 @@
 
 	"launchpad.net/juju-core/testing"
 	jc "launchpad.net/juju-core/testing/checkers"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 type PluginSuite struct {
-	testing.LoggingSuite
+	testbase.LoggingSuite
 	oldPath string
 	home    *testing.FakeHome
 }
 
=== modified file 'cmd/juju/publish_test.go'
--- cmd/juju/publish_test.go	2013-09-13 14:48:13 +0000
+++ cmd/juju/publish_test.go	2013-09-20 02:56:01 +0000
@@ -13,12 +13,13 @@
 	"launchpad.net/juju-core/charm"
 	"launchpad.net/juju-core/cmd"
 	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 // Sadly, this is a very slow test suite, heavily dominated by calls to bzr.
 
 type PublishSuite struct {
-	testing.LoggingSuite
+	testbase.LoggingSuite
 	testing.HTTPSuite
 
 	home       *testing.FakeHome
 
=== modified file 'cmd/juju/synctools_test.go'
--- cmd/juju/synctools_test.go	2013-09-13 04:16:42 +0000
+++ cmd/juju/synctools_test.go	2013-09-20 02:56:01 +0000
@@ -15,10 +15,11 @@
 	"launchpad.net/juju-core/provider/dummy"
 	coretesting "launchpad.net/juju-core/testing"
 	jc "launchpad.net/juju-core/testing/checkers"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 type syncToolsSuite struct {
-	coretesting.LoggingSuite
+	testbase.LoggingSuite
 	home         *coretesting.FakeHome
 	targetEnv    environs.Environ
 	localStorage string
 
=== modified file 'cmd/jujud/agent_test.go'
--- cmd/jujud/agent_test.go	2013-09-18 22:54:32 +0000
+++ cmd/jujud/agent_test.go	2013-09-20 02:56:01 +0000
@@ -23,6 +23,7 @@
 	"launchpad.net/juju-core/state/api/params"
 	coretesting "launchpad.net/juju-core/testing"
 	jc "launchpad.net/juju-core/testing/checkers"
+	"launchpad.net/juju-core/testing/testbase"
 	coretools "launchpad.net/juju-core/tools"
 	"launchpad.net/juju-core/version"
 	"launchpad.net/juju-core/worker"
@@ -32,7 +33,7 @@
 var _ = gc.Suite(&toolSuite{})
 
 type toolSuite struct {
-	coretesting.LoggingSuite
+	testbase.LoggingSuite
 }
 
 var errorImportanceTests = []error{
 
=== modified file 'cmd/jujud/bootstrap_test.go'
--- cmd/jujud/bootstrap_test.go	2013-09-12 12:38:04 +0000
+++ cmd/jujud/bootstrap_test.go	2013-09-20 02:56:01 +0000
@@ -20,13 +20,14 @@
 	"launchpad.net/juju-core/provider/dummy"
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 	"launchpad.net/juju-core/utils"
 )
 
 // We don't want to use JujuConnSuite because it gives us
 // an already-bootstrapped environment.
 type BootstrapSuite struct {
-	testing.LoggingSuite
+	testbase.LoggingSuite
 	testing.MgoSuite
 	dataDir              string
 	providerStateURLFile string
 
=== modified file 'cmd/jujud/machine_test.go'
--- cmd/jujud/machine_test.go	2013-09-19 14:48:05 +0000
+++ cmd/jujud/machine_test.go	2013-09-20 02:56:01 +0000
@@ -25,6 +25,7 @@
 	"launchpad.net/juju-core/state/watcher"
 	"launchpad.net/juju-core/testing"
 	jc "launchpad.net/juju-core/testing/checkers"
+	"launchpad.net/juju-core/testing/testbase"
 	"launchpad.net/juju-core/tools"
 	"launchpad.net/juju-core/version"
 	"launchpad.net/juju-core/worker/deployer"
@@ -40,7 +41,7 @@
 func (s *MachineSuite) SetUpSuite(c *gc.C) {
 	s.agentSuite.SetUpSuite(c)
 	s.TestSuite.SetUpSuite(c)
-	restore := testing.PatchValue(&charm.CacheDir, c.MkDir())
+	restore := testbase.PatchValue(&charm.CacheDir, c.MkDir())
 	s.AddSuiteCleanup(func(*gc.C) { restore() })
 }
 
 
=== modified file 'cmd/logging_test.go'
--- cmd/logging_test.go	2013-09-19 02:17:33 +0000
+++ cmd/logging_test.go	2013-09-20 02:56:01 +0000
@@ -13,12 +13,13 @@
 	"launchpad.net/juju-core/cmd"
 	"launchpad.net/juju-core/juju/osenv"
 	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 var logger = loggo.GetLogger("juju.test")
 
 type LogSuite struct {
-	testing.CleanupSuite
+	testbase.CleanupSuite
 }
 
 var _ = gc.Suite(&LogSuite{})
@@ -59,7 +60,7 @@
 
 func (s *LogSuite) TestLogConfigFromEnvironment(c *gc.C) {
 	config := "juju.cmd=INFO;juju.worker.deployer=DEBUG"
-	testing.PatchEnvironment(osenv.JujuLoggingConfig, config)
+	testbase.PatchEnvironment(osenv.JujuLoggingConfig, config)
 	log := newLogWithFlags(c, []string{})
 	c.Assert(log.Path, gc.Equals, "")
 	c.Assert(log.Verbose, gc.Equals, false)
 
=== modified file 'container/lxc/lxc_test.go'
--- container/lxc/lxc_test.go	2013-09-19 03:23:04 +0000
+++ container/lxc/lxc_test.go	2013-09-20 02:56:01 +0000
@@ -21,6 +21,7 @@
 	jujutesting "launchpad.net/juju-core/juju/testing"
 	"launchpad.net/juju-core/testing"
 	jc "launchpad.net/juju-core/testing/checkers"
+	"launchpad.net/juju-core/testing/testbase"
 	"launchpad.net/juju-core/tools"
 	"launchpad.net/juju-core/version"
 )
@@ -30,7 +31,7 @@
 }
 
 type LxcSuite struct {
-	testing.LoggingSuite
+	testbase.LoggingSuite
 	lxc.TestSuite
 	oldPath string
 }
@@ -217,7 +218,7 @@
 }
 
 type NetworkSuite struct {
-	testing.LoggingSuite
+	testbase.LoggingSuite
 }
 
 var _ = gc.Suite(&NetworkSuite{})
 
=== modified file 'downloader/downloader_test.go'
--- downloader/downloader_test.go	2013-08-19 11:17:19 +0000
+++ downloader/downloader_test.go	2013-09-20 02:56:01 +0000
@@ -14,10 +14,11 @@
 
 	"launchpad.net/juju-core/downloader"
 	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 type suite struct {
-	testing.LoggingSuite
+	testbase.LoggingSuite
 	testing.HTTPSuite
 }
 
 
=== modified file 'environs/bootstrap/bootstrap_test.go'
--- environs/bootstrap/bootstrap_test.go	2013-09-19 00:22:15 +0000
+++ environs/bootstrap/bootstrap_test.go	2013-09-20 02:56:01 +0000
@@ -17,6 +17,7 @@
 	envtesting "launchpad.net/juju-core/environs/testing"
 	"launchpad.net/juju-core/provider/dummy"
 	coretesting "launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 	"launchpad.net/juju-core/tools"
 	"launchpad.net/juju-core/version"
 )
@@ -32,7 +33,7 @@
 
 type bootstrapSuite struct {
 	home *coretesting.FakeHome
-	coretesting.LoggingSuite
+	testbase.LoggingSuite
 	envtesting.ToolsFixture
 }
 
 
=== modified file 'environs/cert_internal_test.go'
--- environs/cert_internal_test.go	2013-08-19 16:10:25 +0000
+++ environs/cert_internal_test.go	2013-09-20 02:56:01 +0000
@@ -8,11 +8,12 @@
 
 	"launchpad.net/juju-core/cert"
 	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 // EnvironsCertSuite tests the internal functions defined in environs/cert.go
 type EnvironsCertSuite struct {
-	testing.LoggingSuite
+	testbase.LoggingSuite
 }
 
 var _ = gc.Suite(&EnvironsCertSuite{})
 
=== modified file 'environs/cert_test.go'
--- environs/cert_test.go	2013-08-19 16:11:44 +0000
+++ environs/cert_test.go	2013-09-20 02:56:01 +0000
@@ -11,10 +11,11 @@
 	"launchpad.net/juju-core/environs"
 	"launchpad.net/juju-core/environs/config"
 	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 type EnvironsCertSuite struct {
-	testing.LoggingSuite
+	testbase.LoggingSuite
 }
 
 var _ = gc.Suite(&EnvironsCertSuite{})
 
=== modified file 'environs/cloudinit/cloudinit_test.go'
--- environs/cloudinit/cloudinit_test.go	2013-09-16 23:06:44 +0000
+++ environs/cloudinit/cloudinit_test.go	2013-09-20 02:56:01 +0000
@@ -20,6 +20,7 @@
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/state/api"
 	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 	"launchpad.net/juju-core/tools"
 	"launchpad.net/juju-core/version"
 )
@@ -27,7 +28,7 @@
 // Use local suite since this file lives in the ec2 package
 // for testing internals.
 type cloudinitSuite struct {
-	testing.LoggingSuite
+	testbase.LoggingSuite
 }
 
 var _ = gc.Suite(&cloudinitSuite{})
 
=== modified file 'environs/cloudinit_test.go'
--- environs/cloudinit_test.go	2013-09-12 21:32:12 +0000
+++ environs/cloudinit_test.go	2013-09-20 02:56:01 +0000
@@ -19,6 +19,7 @@
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/state/api"
 	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 	"launchpad.net/juju-core/tools"
 	"launchpad.net/juju-core/utils"
 	"launchpad.net/juju-core/version"
@@ -34,7 +35,7 @@
 }
 
 type CloudInitSuite struct {
-	testing.LoggingSuite
+	testbase.LoggingSuite
 }
 
 var _ = gc.Suite(&CloudInitSuite{})
 
=== modified file 'environs/config/config_test.go'
--- environs/config/config_test.go	2013-09-19 02:17:33 +0000
+++ environs/config/config_test.go	2013-09-20 02:56:01 +0000
@@ -17,6 +17,7 @@
 	"launchpad.net/juju-core/schema"
 	"launchpad.net/juju-core/testing"
 	jc "launchpad.net/juju-core/testing/checkers"
+	"launchpad.net/juju-core/testing/testbase"
 	"launchpad.net/juju-core/version"
 )
 
@@ -25,7 +26,7 @@
 }
 
 type ConfigSuite struct {
-	testing.LoggingSuite
+	testbase.LoggingSuite
 	home string
 }
 
 
=== modified file 'environs/httpstorage/backend_test.go'
--- environs/httpstorage/backend_test.go	2013-09-19 03:14:56 +0000
+++ environs/httpstorage/backend_test.go	2013-09-20 02:56:01 +0000
@@ -18,7 +18,7 @@
 
 	"launchpad.net/juju-core/environs/filestorage"
 	"launchpad.net/juju-core/environs/httpstorage"
-	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 func TestLocal(t *stdtesting.T) {
@@ -26,7 +26,7 @@
 }
 
 type backendSuite struct {
-	testing.LoggingSuite
+	testbase.LoggingSuite
 }
 
 var _ = gc.Suite(&backendSuite{})
 
=== modified file 'environs/imagemetadata/validation_test.go'
--- environs/imagemetadata/validation_test.go	2013-09-12 00:17:20 +0000
+++ environs/imagemetadata/validation_test.go	2013-09-20 02:56:01 +0000
@@ -10,10 +10,11 @@
 	"launchpad.net/juju-core/environs/imagemetadata"
 	"launchpad.net/juju-core/environs/simplestreams"
 	coretesting "launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 type ValidateSuite struct {
-	coretesting.LoggingSuite
+	testbase.LoggingSuite
 	home *coretesting.FakeHome
 }
 
 
=== modified file 'environs/instances/image_test.go'
--- environs/instances/image_test.go	2013-09-13 14:48:13 +0000
+++ environs/instances/image_test.go	2013-09-20 02:56:01 +0000
@@ -11,11 +11,11 @@
 	"launchpad.net/juju-core/constraints"
 	"launchpad.net/juju-core/environs/imagemetadata"
 	"launchpad.net/juju-core/environs/simplestreams"
-	coretesting "launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 type imageSuite struct {
-	coretesting.LoggingSuite
+	testbase.LoggingSuite
 }
 
 func Test(t *testing.T) {
@@ -24,14 +24,6 @@
 
 var _ = gc.Suite(&imageSuite{})
 
-func (s *imageSuite) SetUpSuite(c *gc.C) {
-	s.LoggingSuite.SetUpSuite(c)
-}
-
-func (s *imageSuite) TearDownSuite(c *gc.C) {
-	s.LoggingSuite.TearDownTest(c)
-}
-
 var jsonImagesContent = `
 {
  "content_id": "com.ubuntu.cloud:released:aws",
 
=== modified file 'environs/instances/instancetype_test.go'
--- environs/instances/instancetype_test.go	2013-08-14 17:33:09 +0000
+++ environs/instances/instancetype_test.go	2013-09-20 02:56:01 +0000
@@ -9,23 +9,15 @@
 	gc "launchpad.net/gocheck"
 
 	"launchpad.net/juju-core/constraints"
-	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 type instanceTypeSuite struct {
-	testing.LoggingSuite
+	testbase.LoggingSuite
 }
 
 var _ = gc.Suite(&instanceTypeSuite{})
 
-func (s *instanceTypeSuite) SetUpSuite(c *gc.C) {
-	s.LoggingSuite.SetUpSuite(c)
-}
-
-func (s *instanceTypeSuite) TearDownSuite(c *gc.C) {
-	s.LoggingSuite.TearDownTest(c)
-}
-
 var hvm = "hvm"
 
 // The instance types below do not necessarily reflect reality and are just
 
=== modified file 'environs/jujutest/livetests.go'
--- environs/jujutest/livetests.go	2013-09-18 22:54:32 +0000
+++ environs/jujutest/livetests.go	2013-09-20 02:56:01 +0000
@@ -33,6 +33,7 @@
 	statetesting "launchpad.net/juju-core/state/testing"
 	coretesting "launchpad.net/juju-core/testing"
 	jc "launchpad.net/juju-core/testing/checkers"
+	"launchpad.net/juju-core/testing/testbase"
 	coretools "launchpad.net/juju-core/tools"
 	"launchpad.net/juju-core/utils"
 	"launchpad.net/juju-core/version"
@@ -42,7 +43,7 @@
 // (e.g. Amazon EC2).  The Environ is opened once only for all the tests
 // in the suite, stored in Env, and Destroyed after the suite has completed.
 type LiveTests struct {
-	coretesting.LoggingSuite
+	testbase.LoggingSuite
 	envtesting.ToolsFixture
 
 	// TestConfig contains the configuration attributes for opening an environment.
 
=== modified file 'environs/jujutest/tests.go'
--- environs/jujutest/tests.go	2013-09-18 22:54:32 +0000
+++ environs/jujutest/tests.go	2013-09-20 02:56:01 +0000
@@ -22,6 +22,7 @@
 	"launchpad.net/juju-core/juju/testing"
 	coretesting "launchpad.net/juju-core/testing"
 	jc "launchpad.net/juju-core/testing/checkers"
+	"launchpad.net/juju-core/testing/testbase"
 	"launchpad.net/juju-core/utils"
 	"launchpad.net/juju-core/version"
 )
@@ -32,7 +33,7 @@
 // is opened once for each test, and some potentially expensive operations
 // may be executed.
 type Tests struct {
-	coretesting.LoggingSuite
+	testbase.LoggingSuite
 	TestConfig coretesting.Attrs
 	envtesting.ToolsFixture
 	Env environs.Environ
 
=== modified file 'environs/manual/detection_test.go'
--- environs/manual/detection_test.go	2013-09-11 01:58:11 +0000
+++ environs/manual/detection_test.go	2013-09-20 02:56:01 +0000
@@ -12,12 +12,12 @@
 
 	gc "launchpad.net/gocheck"
 
-	"launchpad.net/juju-core/testing"
 	jc "launchpad.net/juju-core/testing/checkers"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 type detectionSuite struct {
-	testing.LoggingSuite
+	testbase.LoggingSuite
 }
 
 var _ = gc.Suite(&detectionSuite{})
@@ -71,7 +71,7 @@
 	c.Assert(err, gc.IsNil)
 	err = ioutil.WriteFile(sshexpectedinput, []byte(input), 0644)
 	c.Assert(err, gc.IsNil)
-	return testing.PatchEnvironment("PATH", fakebin+":"+os.Getenv("PATH"))
+	return testbase.PatchEnvironment("PATH", fakebin+":"+os.Getenv("PATH"))
 }
 
 func (s *detectionSuite) TestDetectSeries(c *gc.C) {
 
=== modified file 'environs/mongo_test.go'
--- environs/mongo_test.go	2013-08-21 18:38:22 +0000
+++ environs/mongo_test.go	2013-09-20 02:56:01 +0000
@@ -9,12 +9,13 @@
 	"launchpad.net/juju-core/environs"
 	"launchpad.net/juju-core/provider/dummy"
 	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 	"launchpad.net/juju-core/version"
 )
 
 type MongoToolsSuite struct {
 	env environs.Environ
-	testing.LoggingSuite
+	testbase.LoggingSuite
 	dataDir string
 }
 
 
=== modified file 'environs/simplestreams/testing/testing.go'
--- environs/simplestreams/testing/testing.go	2013-09-09 03:45:08 +0000
+++ environs/simplestreams/testing/testing.go	2013-09-20 02:56:01 +0000
@@ -13,7 +13,7 @@
 
 	"launchpad.net/juju-core/environs/jujutest"
 	"launchpad.net/juju-core/environs/simplestreams"
-	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 var imageData = map[string]string{
@@ -392,7 +392,7 @@
 }
 
 type LocalLiveSimplestreamsSuite struct {
-	testing.LoggingSuite
+	testbase.LoggingSuite
 	Source          simplestreams.DataSource
 	RequireSigned   bool
 	DataType        string
 
=== modified file 'environs/sshstorage/storage_test.go'
--- environs/sshstorage/storage_test.go	2013-09-20 01:34:00 +0000
+++ environs/sshstorage/storage_test.go	2013-09-20 02:56:01 +0000
@@ -20,13 +20,13 @@
 
 	"launchpad.net/juju-core/environs/storage"
 	coreerrors "launchpad.net/juju-core/errors"
-	"launchpad.net/juju-core/testing"
 	jc "launchpad.net/juju-core/testing/checkers"
+	"launchpad.net/juju-core/testing/testbase"
 	"launchpad.net/juju-core/utils"
 )
 
 type storageSuite struct {
-	testing.LoggingSuite
+	testbase.LoggingSuite
 	restoreEnv func()
 }
 
@@ -42,8 +42,8 @@
 	cmd := exec.Command("bash", "-c", command)
 	uid := fmt.Sprint(os.Getuid())
 	gid := fmt.Sprint(os.Getgid())
-	defer testing.PatchEnvironment("SUDO_UID", uid)()
-	defer testing.PatchEnvironment("SUDO_GID", gid)()
+	defer testbase.PatchEnvironment("SUDO_UID", uid)()
+	defer testbase.PatchEnvironment("SUDO_GID", gid)()
 	cmd.Env = os.Environ()
 	return cmd
 }
@@ -59,7 +59,7 @@
 	c.Assert(err, gc.IsNil)
 
 	bin := c.MkDir()
-	s.restoreEnv = testing.PatchEnvironment("PATH", bin+":"+os.Getenv("PATH"))
+	s.restoreEnv = testbase.PatchEnvironment("PATH", bin+":"+os.Getenv("PATH"))
 
 	// Create a "sudo" command which just executes its args.
 	c.Assert(os.Symlink("/usr/bin/env", filepath.Join(bin, "sudo")), gc.IsNil)
 
=== modified file 'environs/sync/sync_test.go'
--- environs/sync/sync_test.go	2013-09-20 00:33:38 +0000
+++ environs/sync/sync_test.go	2013-09-20 02:56:01 +0000
@@ -25,6 +25,7 @@
 	envtools "launchpad.net/juju-core/environs/tools"
 	"launchpad.net/juju-core/provider/dummy"
 	coretesting "launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 	coretools "launchpad.net/juju-core/tools"
 	"launchpad.net/juju-core/version"
 )
@@ -34,7 +35,7 @@
 }
 
 type syncSuite struct {
-	coretesting.LoggingSuite
+	testbase.LoggingSuite
 	envtesting.ToolsFixture
 	home         *coretesting.FakeHome
 	targetEnv    environs.Environ
@@ -241,7 +242,7 @@
 
 type uploadSuite struct {
 	env environs.Environ
-	coretesting.LoggingSuite
+	testbase.LoggingSuite
 	envtesting.ToolsFixture
 }
 
 
=== modified file 'environs/tools/build_test.go'
--- environs/tools/build_test.go	2013-08-21 01:31:34 +0000
+++ environs/tools/build_test.go	2013-09-20 02:56:01 +0000
@@ -12,11 +12,11 @@
 	gc "launchpad.net/gocheck"
 
 	"launchpad.net/juju-core/environs/tools"
-	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 type buildSuite struct {
-	testing.LoggingSuite
+	testbase.LoggingSuite
 	restore  func()
 	cwd      string
 	filePath string
 
=== modified file 'environs/tools/storage_test.go'
--- environs/tools/storage_test.go	2013-09-17 05:29:35 +0000
+++ environs/tools/storage_test.go	2013-09-20 02:56:01 +0000
@@ -11,14 +11,14 @@
 	envtesting "launchpad.net/juju-core/environs/testing"
 	envtools "launchpad.net/juju-core/environs/tools"
 	"launchpad.net/juju-core/provider/dummy"
-	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 	coretools "launchpad.net/juju-core/tools"
 	"launchpad.net/juju-core/version"
 )
 
 type StorageSuite struct {
 	env environs.Environ
-	testing.LoggingSuite
+	testbase.LoggingSuite
 	dataDir string
 }
 
 
=== modified file 'environs/tools/tools_test.go'
--- environs/tools/tools_test.go	2013-09-20 00:33:38 +0000
+++ environs/tools/tools_test.go	2013-09-20 02:56:01 +0000
@@ -22,8 +22,8 @@
 	envtools "launchpad.net/juju-core/environs/tools"
 	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/provider/dummy"
-	"launchpad.net/juju-core/testing"
 	jc "launchpad.net/juju-core/testing/checkers"
+	"launchpad.net/juju-core/testing/testbase"
 	coretools "launchpad.net/juju-core/tools"
 	"launchpad.net/juju-core/version"
 )
@@ -40,7 +40,7 @@
 type ToolsSuite struct {
 	toolsTestHelper
 	env environs.Environ
-	testing.LoggingSuite
+	testbase.LoggingSuite
 	envtesting.ToolsFixture
 	origCurrentVersion version.Binary
 }
 
=== modified file 'environs/tools/validation_test.go'
--- environs/tools/validation_test.go	2013-09-12 00:17:20 +0000
+++ environs/tools/validation_test.go	2013-09-20 02:56:01 +0000
@@ -9,10 +9,11 @@
 	"launchpad.net/juju-core/environs/config"
 	"launchpad.net/juju-core/environs/simplestreams"
 	coretesting "launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 type ValidateSuite struct {
-	coretesting.LoggingSuite
+	testbase.LoggingSuite
 	home *coretesting.FakeHome
 }
 
 
=== modified file 'instance/address_test.go'
--- instance/address_test.go	2013-09-19 03:23:04 +0000
+++ instance/address_test.go	2013-09-20 02:56:01 +0000
@@ -9,11 +9,11 @@
 
 	gc "launchpad.net/gocheck"
 
-	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 type AddressSuite struct {
-	testing.LoggingSuite
+	testbase.LoggingSuite
 }
 
 var _ = gc.Suite(&AddressSuite{})
 
=== modified file 'juju/apiconn_test.go'
--- juju/apiconn_test.go	2013-09-19 17:06:44 +0000
+++ juju/apiconn_test.go	2013-09-20 02:56:01 +0000
@@ -20,10 +20,11 @@
 	"launchpad.net/juju-core/state/api"
 	coretesting "launchpad.net/juju-core/testing"
 	jc "launchpad.net/juju-core/testing/checkers"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 type NewAPIConnSuite struct {
-	coretesting.LoggingSuite
+	testbase.LoggingSuite
 	envtesting.ToolsFixture
 }
 
@@ -58,7 +59,7 @@
 }
 
 type NewAPIClientSuite struct {
-	coretesting.LoggingSuite
+	testbase.LoggingSuite
 }
 
 var _ = gc.Suite(&NewAPIClientSuite{})
@@ -75,7 +76,7 @@
 	// Make sure of that by providing a suitably long delay
 	// and checking that the connection happens within that
 	// time.
-	defer coretesting.PatchValue(juju.ProviderConnectDelay, coretesting.LongWait).Restore()
+	defer testbase.PatchValue(juju.ProviderConnectDelay, coretesting.LongWait).Restore()
 	bootstrapEnv(c, coretesting.SampleEnvName)
 
 	startTime := time.Now()
@@ -125,7 +126,7 @@
 		called++
 		return expectState, nil
 	}
-	defer coretesting.PatchValue(juju.APIOpen, apiOpen).Restore()
+	defer testbase.PatchValue(juju.APIOpen, apiOpen).Restore()
 	st, err := juju.NewAPIFromName("noconfig", store)
 	c.Assert(err, gc.IsNil)
 	c.Assert(st, gc.Equals, expectState)
@@ -138,7 +139,7 @@
 	store := newConfigStore("noconfig", &environInfo{
 		err: expectErr,
 	})
-	defer coretesting.PatchValue(juju.APIOpen, panicAPIOpen).Restore()
+	defer testbase.PatchValue(juju.APIOpen, panicAPIOpen).Restore()
 	client, err := juju.NewAPIFromName("noconfig", store)
 	c.Assert(err, gc.Equals, expectErr)
 	c.Assert(client, gc.IsNil)
@@ -157,7 +158,7 @@
 	store := newConfigStore("noconfig", &environInfo{
 		endpoint: endpoint,
 	})
-	defer coretesting.PatchValue(juju.APIOpen, panicAPIOpen).Restore()
+	defer testbase.PatchValue(juju.APIOpen, panicAPIOpen).Restore()
 
 	st, err := juju.NewAPIFromName("noconfig", store)
 	c.Assert(err, gc.ErrorMatches, `environment "noconfig" not found`)
@@ -177,7 +178,7 @@
 	apiOpen := func(apiInfo *api.Info, opts api.DialOpts) (*api.State, error) {
 		return nil, expectErr
 	}
-	defer coretesting.PatchValue(juju.APIOpen, apiOpen).Restore()
+	defer testbase.PatchValue(juju.APIOpen, apiOpen).Restore()
 	st, err := juju.NewAPIFromName("noconfig", store)
 	c.Assert(err, gc.Equals, expectErr)
 	c.Assert(st, gc.IsNil)
@@ -199,7 +200,7 @@
 	// On a sample run with no delay, the logic took 45ms to run, so
 	// we make the delay slightly more than that, so that if the
 	// logic doesn't delay at all, the test will fail reasonably consistently.
-	defer coretesting.PatchValue(juju.ProviderConnectDelay, 50*time.Millisecond).Restore()
+	defer testbase.PatchValue(juju.ProviderConnectDelay, 50*time.Millisecond).Restore()
 	apiOpen := func(info *api.Info, opts api.DialOpts) (*api.State, error) {
 		if info.Addrs[0] == "infoapi.com" {
 			infoEndpointOpened <- struct{}{}
@@ -207,7 +208,7 @@
 		}
 		return cfgOpenedState, nil
 	}
-	defer coretesting.PatchValue(juju.APIOpen, apiOpen).Restore()
+	defer testbase.PatchValue(juju.APIOpen, apiOpen).Restore()
 
 	stateClosed, restoreAPIClose := setAPIClosed()
 	defer restoreAPIClose.Restore()
@@ -250,7 +251,7 @@
 	cfgOpenedState := new(api.State)
 	cfgEndpointOpened := make(chan struct{})
 
-	defer coretesting.PatchValue(juju.ProviderConnectDelay, 0*time.Second).Restore()
+	defer testbase.PatchValue(juju.ProviderConnectDelay, 0*time.Second).Restore()
 	apiOpen := func(info *api.Info, opts api.DialOpts) (*api.State, error) {
 		if info.Addrs[0] == "infoapi.com" {
 			infoEndpointOpened <- struct{}{}
@@ -261,7 +262,7 @@
 		<-cfgEndpointOpened
 		return cfgOpenedState, nil
 	}
-	defer coretesting.PatchValue(juju.APIOpen, apiOpen).Restore()
+	defer testbase.PatchValue(juju.APIOpen, apiOpen).Restore()
 
 	stateClosed, restoreAPIClose := setAPIClosed()
 	defer restoreAPIClose.Restore()
@@ -315,14 +316,14 @@
 		endpoint: endpoint,
 	})
 
-	defer coretesting.PatchValue(juju.ProviderConnectDelay, 0*time.Second).Restore()
+	defer testbase.PatchValue(juju.ProviderConnectDelay, 0*time.Second).Restore()
 	apiOpen := func(info *api.Info, opts api.DialOpts) (*api.State, error) {
 		if info.Addrs[0] == "infoapi.com" {
 			return nil, fmt.Errorf("info connect failed")
 		}
 		return nil, fmt.Errorf("config connect failed")
 	}
-	defer coretesting.PatchValue(juju.APIOpen, apiOpen).Restore()
+	defer testbase.PatchValue(juju.APIOpen, apiOpen).Restore()
 	st, err := juju.NewAPIFromName(coretesting.SampleEnvName, store)
 	c.Check(err, gc.ErrorMatches, "config connect failed")
 	c.Check(st, gc.IsNil)
@@ -344,13 +345,13 @@
 	c.Assert(envInfo.Name, gc.Equals, expectName)
 }
 
-func setAPIClosed() (<-chan *api.State, coretesting.Restorer) {
+func setAPIClosed() (<-chan *api.State, testbase.Restorer) {
 	stateClosed := make(chan *api.State)
 	apiClose := func(st *api.State) error {
 		stateClosed <- st
 		return nil
 	}
-	return stateClosed, coretesting.PatchValue(juju.APIClose, apiClose)
+	return stateClosed, testbase.PatchValue(juju.APIClose, apiClose)
 }
 
 func newConfigStore(envName string, info *environInfo) environs.ConfigStorage {
 
=== modified file 'juju/conn_test.go'
--- juju/conn_test.go	2013-09-13 14:48:13 +0000
+++ juju/conn_test.go	2013-09-20 02:56:01 +0000
@@ -27,6 +27,7 @@
 	"launchpad.net/juju-core/state"
 	coretesting "launchpad.net/juju-core/testing"
 	jc "launchpad.net/juju-core/testing/checkers"
+	"launchpad.net/juju-core/testing/testbase"
 	"launchpad.net/juju-core/utils"
 	"launchpad.net/juju-core/utils/set"
 )
@@ -36,7 +37,7 @@
 }
 
 type NewConnSuite struct {
-	coretesting.LoggingSuite
+	testbase.LoggingSuite
 	envtesting.ToolsFixture
 }
 
@@ -222,7 +223,7 @@
 }
 
 type ConnSuite struct {
-	coretesting.LoggingSuite
+	testbase.LoggingSuite
 	coretesting.MgoSuite
 	envtesting.ToolsFixture
 	conn *juju.Conn
 
=== modified file 'juju/osenv/package_test.go'
--- juju/osenv/package_test.go	2013-08-28 20:37:53 +0000
+++ juju/osenv/package_test.go	2013-09-20 02:56:01 +0000
@@ -8,7 +8,7 @@
 
 	gc "launchpad.net/gocheck"
 
-	coretesting "launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 func Test(t *testing.T) {
@@ -21,6 +21,6 @@
 
 func (*importSuite) TestDependencies(c *gc.C) {
 	// This test is to ensure we don't bring in dependencies at all.
-	c.Assert(coretesting.FindJujuCoreImports(c, "launchpad.net/juju-core/juju/osenv"),
+	c.Assert(testbase.FindJujuCoreImports(c, "launchpad.net/juju-core/juju/osenv"),
 		gc.HasLen, 0)
 }
 
=== modified file 'juju/osenv/vars_linux_test.go'
--- juju/osenv/vars_linux_test.go	2013-09-04 14:27:52 +0000
+++ juju/osenv/vars_linux_test.go	2013-09-20 02:56:01 +0000
@@ -4,11 +4,11 @@
 	gc "launchpad.net/gocheck"
 
 	"launchpad.net/juju-core/juju/osenv"
-	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 func (*importSuite) TestHomeLinux(c *gc.C) {
 	h := "/home/foo/bar"
-	testing.PatchEnvironment("HOME", h)
+	testbase.PatchEnvironment("HOME", h)
 	c.Check(osenv.Home(), gc.Equals, h)
 }
 
=== modified file 'juju/osenv/vars_windows_test.go'
--- juju/osenv/vars_windows_test.go	2013-09-04 14:27:52 +0000
+++ juju/osenv/vars_windows_test.go	2013-09-20 02:56:01 +0000
@@ -10,8 +10,8 @@
 )
 
 func (*importSuite) TestHome(c *gc.C) {
-	testing.PatchEnvironment("HOMEPATH", "")
-	testing.PatchEnvironment("HOMEDRIVE", "")
+	testbase.PatchEnvironment("HOMEPATH", "")
+	testbase.PatchEnvironment("HOMEDRIVE", "")
 
 	drive := "P:"
 	path := `\home\foo\bar`
 
=== modified file 'juju/testing/conn.go'
--- juju/testing/conn.go	2013-09-17 04:06:28 +0000
+++ juju/testing/conn.go	2013-09-20 02:56:01 +0000
@@ -28,11 +28,12 @@
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/state/api"
 	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 	"launchpad.net/juju-core/version"
 )
 
 // JujuConnSuite provides a freshly bootstrapped juju.Conn
-// for each test. It also includes testing.LoggingSuite.
+// for each test. It also includes testbase.LoggingSuite.
 //
 // It also sets up RootDir to point to a directory hierarchy
 // mirroring the intended juju directory structure, including
@@ -50,7 +51,7 @@
 	// /var/lib/juju: the use cases are completely non-overlapping, and any tests that
 	// really do need both to exist ought to be embedding distinct fixtures for the
 	// distinct environments.
-	testing.LoggingSuite
+	testbase.LoggingSuite
 	testing.MgoSuite
 	envtesting.ToolsFixture
 	Conn         *juju.Conn
 
=== modified file 'provider/azure/azure_test.go'
--- provider/azure/azure_test.go	2013-09-10 02:17:23 +0000
+++ provider/azure/azure_test.go	2013-09-20 02:56:01 +0000
@@ -9,7 +9,7 @@
 	gc "launchpad.net/gocheck"
 
 	envtesting "launchpad.net/juju-core/environs/testing"
-	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 func TestAzureProvider(t *stdtesting.T) {
@@ -17,7 +17,7 @@
 }
 
 type providerSuite struct {
-	testing.LoggingSuite
+	testbase.LoggingSuite
 	envtesting.ToolsFixture
 	restoreTimeouts func()
 }
 
=== modified file 'provider/azure/config_test.go'
--- provider/azure/config_test.go	2013-09-12 12:38:04 +0000
+++ provider/azure/config_test.go	2013-09-20 02:56:01 +0000
@@ -11,10 +11,11 @@
 
 	"launchpad.net/juju-core/environs/config"
 	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 type configSuite struct {
-	testing.LoggingSuite
+	testbase.LoggingSuite
 }
 
 var _ = gc.Suite(&configSuite{})
 
=== modified file 'provider/azure/customdata_test.go'
--- provider/azure/customdata_test.go	2013-08-22 23:39:47 +0000
+++ provider/azure/customdata_test.go	2013-09-20 02:56:01 +0000
@@ -14,11 +14,12 @@
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/state/api"
 	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 	"launchpad.net/juju-core/tools"
 )
 
 type customDataSuite struct {
-	testing.LoggingSuite
+	testbase.LoggingSuite
 }
 
 var _ = gc.Suite(&customDataSuite{})
 
=== modified file 'provider/ec2/config_test.go'
--- provider/ec2/config_test.go	2013-09-18 07:13:09 +0000
+++ provider/ec2/config_test.go	2013-09-20 02:56:01 +0000
@@ -18,12 +18,13 @@
 	"launchpad.net/juju-core/environs/config"
 	"launchpad.net/juju-core/juju/osenv"
 	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 // Use local suite since this file lives in the ec2 package
 // for testing internals.
 type ConfigSuite struct {
-	testing.LoggingSuite
+	testbase.LoggingSuite
 	savedHome, savedAccessKey, savedSecretKey string
 }
 
 
=== modified file 'provider/ec2/image_test.go'
--- provider/ec2/image_test.go	2013-09-18 22:54:32 +0000
+++ provider/ec2/image_test.go	2013-09-20 02:56:01 +0000
@@ -10,11 +10,11 @@
 	"launchpad.net/juju-core/environs/imagemetadata"
 	"launchpad.net/juju-core/environs/instances"
 	"launchpad.net/juju-core/environs/simplestreams"
-	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 type imageSuite struct {
-	testing.LoggingSuite
+	testbase.LoggingSuite
 }
 
 var _ = gc.Suite(&imageSuite{})
@@ -30,7 +30,7 @@
 }
 
 type specSuite struct {
-	testing.LoggingSuite
+	testbase.LoggingSuite
 }
 
 var _ = gc.Suite(&specSuite{})
 
=== modified file 'provider/ec2/live_test.go'
--- provider/ec2/live_test.go	2013-09-18 22:54:32 +0000
+++ provider/ec2/live_test.go	2013-09-20 02:56:01 +0000
@@ -26,6 +26,7 @@
 	"launchpad.net/juju-core/provider/ec2"
 	coretesting "launchpad.net/juju-core/testing"
 	jc "launchpad.net/juju-core/testing/checkers"
+	"launchpad.net/juju-core/testing/testbase"
 	"launchpad.net/juju-core/version"
 )
 
@@ -72,7 +73,7 @@
 // LiveTests contains tests that can be run against the Amazon servers.
 // Each test runs using the same ec2 connection.
 type LiveTests struct {
-	coretesting.LoggingSuite
+	testbase.LoggingSuite
 	jujutest.LiveTests
 	writablePublicStorage storage.Storage
 }
 
=== modified file 'provider/ec2/local_test.go'
--- provider/ec2/local_test.go	2013-09-17 05:09:55 +0000
+++ provider/ec2/local_test.go	2013-09-20 02:56:01 +0000
@@ -30,6 +30,7 @@
 	"launchpad.net/juju-core/provider/ec2"
 	"launchpad.net/juju-core/testing"
 	jc "launchpad.net/juju-core/testing/checkers"
+	"launchpad.net/juju-core/testing/testbase"
 	"launchpad.net/juju-core/utils"
 )
 
@@ -372,7 +373,7 @@
 // localNonUSEastSuite is similar to localServerSuite but the S3 mock server
 // behaves as if it is not in the us-east region.
 type localNonUSEastSuite struct {
-	testing.LoggingSuite
+	testbase.LoggingSuite
 	restoreEC2Patching func()
 	srv                localServer
 	env                environs.Environ
 
=== modified file 'provider/local/environprovider_test.go'
--- provider/local/environprovider_test.go	2013-08-20 18:50:48 +0000
+++ provider/local/environprovider_test.go	2013-09-20 02:56:01 +0000
@@ -10,10 +10,11 @@
 	"launchpad.net/juju-core/container/lxc"
 	"launchpad.net/juju-core/provider/local"
 	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 type baseProviderSuite struct {
-	testing.LoggingSuite
+	testbase.LoggingSuite
 	lxc.TestSuite
 	home    *testing.FakeHome
 	restore func()
 
=== modified file 'provider/local/local_test.go'
--- provider/local/local_test.go	2013-08-27 18:33:36 +0000
+++ provider/local/local_test.go	2013-09-20 02:56:01 +0000
@@ -11,7 +11,7 @@
 	"launchpad.net/juju-core/environs"
 	"launchpad.net/juju-core/provider"
 	"launchpad.net/juju-core/provider/local"
-	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 func TestLocal(t *stdtesting.T) {
@@ -19,7 +19,7 @@
 }
 
 type localSuite struct {
-	testing.LoggingSuite
+	testbase.LoggingSuite
 }
 
 var _ = gc.Suite(&localSuite{})
 
=== modified file 'provider/local/prereqs_test.go'
--- provider/local/prereqs_test.go	2013-08-09 06:42:05 +0000
+++ provider/local/prereqs_test.go	2013-09-20 02:56:01 +0000
@@ -10,11 +10,11 @@
 
 	gc "launchpad.net/gocheck"
 
-	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 type prereqsSuite struct {
-	testing.LoggingSuite
+	testbase.LoggingSuite
 	tmpdir  string
 	oldpath string
 }
 
=== modified file 'provider/maas/config_test.go'
--- provider/maas/config_test.go	2013-09-12 12:38:04 +0000
+++ provider/maas/config_test.go	2013-09-20 02:56:01 +0000
@@ -8,10 +8,11 @@
 
 	"launchpad.net/juju-core/environs"
 	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 type configSuite struct {
-	testing.LoggingSuite
+	testbase.LoggingSuite
 }
 
 var _ = gc.Suite(&configSuite{})
 
=== modified file 'provider/maas/maas_test.go'
--- provider/maas/maas_test.go	2013-09-06 01:48:40 +0000
+++ provider/maas/maas_test.go	2013-09-20 02:56:01 +0000
@@ -10,7 +10,7 @@
 	"launchpad.net/gomaasapi"
 
 	envtesting "launchpad.net/juju-core/environs/testing"
-	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 func TestMAAS(t *stdtesting.T) {
@@ -18,7 +18,7 @@
 }
 
 type providerSuite struct {
-	testing.LoggingSuite
+	testbase.LoggingSuite
 	envtesting.ToolsFixture
 	environ         *maasEnviron
 	testMAASObject  *gomaasapi.TestMAASObject
 
=== modified file 'provider/openstack/config_test.go'
--- provider/openstack/config_test.go	2013-09-16 16:40:23 +0000
+++ provider/openstack/config_test.go	2013-09-20 02:56:01 +0000
@@ -15,10 +15,11 @@
 	"launchpad.net/juju-core/environs"
 	"launchpad.net/juju-core/environs/config"
 	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 type ConfigSuite struct {
-	testing.LoggingSuite
+	testbase.LoggingSuite
 	savedVars   map[string]string
 	oldJujuHome *testing.FakeHome
 }
 
=== modified file 'provider/openstack/live_test.go'
--- provider/openstack/live_test.go	2013-09-18 07:13:09 +0000
+++ provider/openstack/live_test.go	2013-09-20 02:56:01 +0000
@@ -18,6 +18,7 @@
 	envtesting "launchpad.net/juju-core/environs/testing"
 	"launchpad.net/juju-core/provider/openstack"
 	coretesting "launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 // generate a different bucket name for each config instance, so that
@@ -72,7 +73,7 @@
 // The deployment can be a real live instance or service doubles.
 // Each test runs using the same connection.
 type LiveTests struct {
-	coretesting.LoggingSuite
+	testbase.LoggingSuite
 	jujutest.LiveTests
 	cred                   *identity.Credentials
 	writeablePublicStorage storage.Storage
 
=== modified file 'provider/openstack/local_test.go'
--- provider/openstack/local_test.go	2013-09-18 22:54:32 +0000
+++ provider/openstack/local_test.go	2013-09-20 02:56:01 +0000
@@ -33,6 +33,7 @@
 	"launchpad.net/juju-core/provider/openstack"
 	coretesting "launchpad.net/juju-core/testing"
 	jc "launchpad.net/juju-core/testing/checkers"
+	"launchpad.net/juju-core/testing/testbase"
 	"launchpad.net/juju-core/version"
 )
 
@@ -149,7 +150,7 @@
 
 // localLiveSuite runs tests from LiveTests using an Openstack service double.
 type localLiveSuite struct {
-	coretesting.LoggingSuite
+	testbase.LoggingSuite
 	LiveTests
 	srv localServer
 }
@@ -184,7 +185,7 @@
 // to test on a live Openstack server. The service double is started and stopped for
 // each test.
 type localServerSuite struct {
-	coretesting.LoggingSuite
+	testbase.LoggingSuite
 	jujutest.Tests
 	cred                   *identity.Credentials
 	srv                    localServer
 
=== modified file 'provider/state_test.go'
--- provider/state_test.go	2013-09-19 00:22:15 +0000
+++ provider/state_test.go	2013-09-20 02:56:01 +0000
@@ -18,10 +18,11 @@
 	"launchpad.net/juju-core/provider"
 	"launchpad.net/juju-core/testing"
 	jc "launchpad.net/juju-core/testing/checkers"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 type StateSuite struct {
-	testing.LoggingSuite
+	testbase.LoggingSuite
 }
 
 var _ = gc.Suite(&StateSuite{})
 
=== modified file 'rpc/jsoncodec/codec_test.go'
--- rpc/jsoncodec/codec_test.go	2013-09-13 14:48:13 +0000
+++ rpc/jsoncodec/codec_test.go	2013-09-20 02:56:01 +0000
@@ -12,11 +12,11 @@
 
 	"launchpad.net/juju-core/rpc"
 	"launchpad.net/juju-core/rpc/jsoncodec"
-	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 type suite struct {
-	testing.LoggingSuite
+	testbase.LoggingSuite
 }
 
 var _ = gc.Suite(&suite{})
 
=== modified file 'rpc/rpc_test.go'
--- rpc/rpc_test.go	2013-09-13 06:42:24 +0000
+++ rpc/rpc_test.go	2013-09-20 02:56:01 +0000
@@ -17,11 +17,11 @@
 	"launchpad.net/juju-core/log"
 	"launchpad.net/juju-core/rpc"
 	"launchpad.net/juju-core/rpc/jsoncodec"
-	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 type suite struct {
-	testing.LoggingSuite
+	testbase.LoggingSuite
 }
 
 var _ = gc.Suite(&suite{})
 
=== modified file 'state/apiserver/common/errors_test.go'
--- state/apiserver/common/errors_test.go	2013-09-18 15:02:31 +0000
+++ state/apiserver/common/errors_test.go	2013-09-20 02:56:01 +0000
@@ -12,12 +12,12 @@
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/state/api/params"
 	"launchpad.net/juju-core/state/apiserver/common"
-	"launchpad.net/juju-core/testing"
 	jc "launchpad.net/juju-core/testing/checkers"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 type errorsSuite struct {
-	testing.LoggingSuite
+	testbase.LoggingSuite
 }
 
 var _ = gc.Suite(&errorsSuite{})
 
=== modified file 'state/conn_test.go'
--- state/conn_test.go	2013-08-19 11:20:02 +0000
+++ state/conn_test.go	2013-09-20 02:56:01 +0000
@@ -11,6 +11,7 @@
 
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 // TestPackage integrates the tests into gotest.
@@ -22,7 +23,7 @@
 // test suites (StateSuite, CharmSuite, MachineSuite, etc).
 type ConnSuite struct {
 	testing.MgoSuite
-	testing.LoggingSuite
+	testbase.LoggingSuite
 	annotations *mgo.Collection
 	charms      *mgo.Collection
 	machines    *mgo.Collection
 
=== modified file 'state/initialize_test.go'
--- state/initialize_test.go	2013-09-13 14:48:13 +0000
+++ state/initialize_test.go	2013-09-20 02:56:01 +0000
@@ -12,11 +12,12 @@
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/testing"
 	jc "launchpad.net/juju-core/testing/checkers"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 type InitializeSuite struct {
 	testing.MgoSuite
-	testing.LoggingSuite
+	testbase.LoggingSuite
 	State *state.State
 }
 
 
=== modified file 'state/megawatcher_internal_test.go'
--- state/megawatcher_internal_test.go	2013-09-13 10:58:13 +0000
+++ state/megawatcher_internal_test.go	2013-09-20 02:56:01 +0000
@@ -20,6 +20,7 @@
 	"launchpad.net/juju-core/state/multiwatcher"
 	"launchpad.net/juju-core/state/watcher"
 	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 var dottedConfig = `
@@ -28,7 +29,7 @@
 `
 
 type storeManagerStateSuite struct {
-	testing.LoggingSuite
+	testbase.LoggingSuite
 	testing.MgoSuite
 	State *State
 }
 
=== modified file 'state/multiwatcher/multiwatcher_internal_test.go'
--- state/multiwatcher/multiwatcher_internal_test.go	2013-09-13 14:48:13 +0000
+++ state/multiwatcher/multiwatcher_internal_test.go	2013-09-20 02:56:01 +0000
@@ -16,7 +16,7 @@
 
 	"launchpad.net/juju-core/state/api/params"
 	"launchpad.net/juju-core/state/watcher"
-	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 func Test(t *stdtesting.T) {
@@ -24,7 +24,7 @@
 }
 
 type storeSuite struct {
-	testing.LoggingSuite
+	testbase.LoggingSuite
 }
 
 var _ = gc.Suite(&storeSuite{})
@@ -270,7 +270,7 @@
 }
 
 type storeManagerSuite struct {
-	testing.LoggingSuite
+	testbase.LoggingSuite
 }
 
 var _ = gc.Suite(&storeManagerSuite{})
 
=== modified file 'state/presence/presence_test.go'
--- state/presence/presence_test.go	2013-09-13 14:48:13 +0000
+++ state/presence/presence_test.go	2013-09-20 02:56:01 +0000
@@ -14,6 +14,7 @@
 
 	"launchpad.net/juju-core/state/presence"
 	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 func TestPackage(t *stdtesting.T) {
@@ -22,7 +23,7 @@
 
 type PresenceSuite struct {
 	testing.MgoSuite
-	testing.LoggingSuite
+	testbase.LoggingSuite
 	presence *mgo.Collection
 	pings    *mgo.Collection
 }
 
=== modified file 'state/settings_test.go'
--- state/settings_test.go	2013-09-13 14:48:13 +0000
+++ state/settings_test.go	2013-09-20 02:56:01 +0000
@@ -12,10 +12,11 @@
 	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/testing"
 	jc "launchpad.net/juju-core/testing/checkers"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 type SettingsSuite struct {
-	testing.LoggingSuite
+	testbase.LoggingSuite
 	testing.MgoSuite
 	state *State
 	key   string
 
=== modified file 'state/watcher/watcher_test.go'
--- state/watcher/watcher_test.go	2013-09-13 14:48:13 +0000
+++ state/watcher/watcher_test.go	2013-09-20 02:56:01 +0000
@@ -14,6 +14,7 @@
 
 	"launchpad.net/juju-core/state/watcher"
 	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 // Test tuning parameters.
@@ -46,7 +47,7 @@
 
 type watcherSuite struct {
 	testing.MgoSuite
-	testing.LoggingSuite
+	testbase.LoggingSuite
 
 	log       *mgo.Collection
 	stash     *mgo.Collection
 
=== modified file 'store/store_test.go'
--- store/store_test.go	2013-08-19 11:20:02 +0000
+++ store/store_test.go	2013-09-20 02:56:01 +0000
@@ -18,6 +18,7 @@
 	"launchpad.net/juju-core/charm"
 	"launchpad.net/juju-core/store"
 	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 func Test(t *stdtesting.T) {
@@ -30,7 +31,7 @@
 type StoreSuite struct {
 	MgoSuite
 	testing.HTTPSuite
-	testing.LoggingSuite
+	testbase.LoggingSuite
 	store *store.Store
 }
 
 
=== modified file 'testing/mgo_test.go'
--- testing/mgo_test.go	2013-08-19 11:20:02 +0000
+++ testing/mgo_test.go	2013-09-20 02:56:01 +0000
@@ -10,10 +10,11 @@
 	gc "launchpad.net/gocheck"
 
 	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 type mgoSuite struct {
-	testing.LoggingSuite
+	testbase.LoggingSuite
 	testing.MgoSuite
 }
 
 
=== added directory 'testing/testbase'
=== renamed file 'testing/cleanup.go' => 'testing/testbase/cleanup.go'
--- testing/cleanup.go	2013-09-19 02:41:40 +0000
+++ testing/testbase/cleanup.go	2013-09-20 02:56:01 +0000
@@ -1,7 +1,7 @@
 // Copyright 2013 Canonical Ltd.
 // Licensed under the AGPLv3, see LICENCE file for details.
 
-package testing
+package testbase
 
 import (
 	gc "launchpad.net/gocheck"
 
=== renamed file 'testing/cleanup_test.go' => 'testing/testbase/cleanup_test.go'
--- testing/cleanup_test.go	2013-09-19 11:37:54 +0000
+++ testing/testbase/cleanup_test.go	2013-09-20 02:56:01 +0000
@@ -1,15 +1,18 @@
-package testing_test
+// Copyright 2013 Canonical Ltd.
+// Licensed under the AGPLv3, see LICENCE file for details.
+
+package testbase_test
 
 import (
 	"os"
 
 	gc "launchpad.net/gocheck"
 
-	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 type cleanupSuite struct {
-	testing.CleanupSuite
+	testbase.CleanupSuite
 }
 
 var _ = gc.Suite(&cleanupSuite{})
 
=== renamed file 'testing/imports.go' => 'testing/testbase/imports.go'
--- testing/imports.go	2013-07-23 21:11:51 +0000
+++ testing/testbase/imports.go	2013-09-20 02:56:01 +0000
@@ -1,7 +1,7 @@
 // Copyright 2013 Canonical Ltd.
 // Licensed under the AGPLv3, see LICENCE file for details.
 
-package testing
+package testbase
 
 import (
 	"go/build"
 
=== renamed file 'testing/log.go' => 'testing/testbase/log.go'
--- testing/log.go	2013-09-17 02:46:26 +0000
+++ testing/testbase/log.go	2013-09-20 02:56:01 +0000
@@ -1,7 +1,7 @@
 // Copyright 2012, 2013 Canonical Ltd.
 // Licensed under the AGPLv3, see LICENCE file for details.
 
-package testing
+package testbase
 
 import (
 	"fmt"
 
=== renamed file 'testing/log_test.go' => 'testing/testbase/log_test.go'
--- testing/log_test.go	2013-09-13 14:48:13 +0000
+++ testing/testbase/log_test.go	2013-09-20 02:56:01 +0000
@@ -1,16 +1,19 @@
-package testing_test
+// Copyright 2013 Canonical Ltd.
+// Licensed under the AGPLv3, see LICENCE file for details.
+
+package testbase_test
 
 import (
 	gc "launchpad.net/gocheck"
 
 	"launchpad.net/juju-core/log"
-	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 var _ = gc.Suite(&logSuite{})
 
 type logSuite struct {
-	testing.LoggingSuite
+	testbase.LoggingSuite
 }
 
 func (s *logSuite) SetUpSuite(c *gc.C) {
 
=== added file 'testing/testbase/package_test.go'
--- testing/testbase/package_test.go	1970-01-01 00:00:00 +0000
+++ testing/testbase/package_test.go	2013-09-20 02:56:01 +0000
@@ -0,0 +1,26 @@
+// Copyright 2013 Canonical Ltd.
+// Licensed under the AGPLv3, see LICENCE file for details.
+
+package testbase_test
+
+import (
+	"testing"
+
+	gc "launchpad.net/gocheck"
+
+	"launchpad.net/juju-core/testing/testbase"
+)
+
+func Test(t *testing.T) {
+	gc.TestingT(t)
+}
+
+type DependencySuite struct{}
+
+var _ = gc.Suite(&DependencySuite{})
+
+func (*DependencySuite) TestPackageDependencies(c *gc.C) {
+	// This test is to ensure we don't bring in any juju-core dependencies.
+	c.Assert(testbase.FindJujuCoreImports(c, "launchpad.net/juju-core/testing/testbase"),
+		gc.HasLen, 0)
+}
 
=== renamed file 'testing/patch.go' => 'testing/testbase/patch.go'
--- testing/patch.go	2013-09-19 02:41:40 +0000
+++ testing/testbase/patch.go	2013-09-20 02:56:01 +0000
@@ -1,4 +1,7 @@
-package testing
+// Copyright 2013 Canonical Ltd.
+// Licensed under the AGPLv3, see LICENCE file for details.
+
+package testbase
 
 import (
 	"os"
 
=== renamed file 'testing/patch_test.go' => 'testing/testbase/patch_test.go'
--- testing/patch_test.go	2013-09-19 02:41:40 +0000
+++ testing/testbase/patch_test.go	2013-09-20 02:56:01 +0000
@@ -1,4 +1,7 @@
-package testing_test
+// Copyright 2013 Canonical Ltd.
+// Licensed under the AGPLv3, see LICENCE file for details.
+
+package testbase_test
 
 import (
 	"errors"
@@ -6,7 +9,7 @@
 
 	gc "launchpad.net/gocheck"
 
-	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 type PatchValueSuite struct{}
@@ -15,7 +18,7 @@
 
 func (*PatchValueSuite) TestSetInt(c *gc.C) {
 	i := 99
-	restore := testing.PatchValue(&i, 88)
+	restore := testbase.PatchValue(&i, 88)
 	c.Assert(i, gc.Equals, 88)
 	restore()
 	c.Assert(i, gc.Equals, 99)
@@ -25,7 +28,7 @@
 	oldErr := errors.New("foo")
 	newErr := errors.New("bar")
 	err := oldErr
-	restore := testing.PatchValue(&err, newErr)
+	restore := testbase.PatchValue(&err, newErr)
 	c.Assert(err, gc.Equals, newErr)
 	restore()
 	c.Assert(err, gc.Equals, oldErr)
@@ -34,7 +37,7 @@
 func (*PatchValueSuite) TestSetErrorToNil(c *gc.C) {
 	oldErr := errors.New("foo")
 	err := oldErr
-	restore := testing.PatchValue(&err, nil)
+	restore := testbase.PatchValue(&err, nil)
 	c.Assert(err, gc.Equals, nil)
 	restore()
 	c.Assert(err, gc.Equals, oldErr)
@@ -43,7 +46,7 @@
 func (*PatchValueSuite) TestSetMapToNil(c *gc.C) {
 	oldMap := map[string]int{"foo": 1234}
 	m := oldMap
-	restore := testing.PatchValue(&m, nil)
+	restore := testbase.PatchValue(&m, nil)
 	c.Assert(m, gc.IsNil)
 	restore()
 	c.Assert(m, gc.DeepEquals, oldMap)
@@ -52,7 +55,7 @@
 func (*PatchValueSuite) TestSetPanicsWhenNotAssignable(c *gc.C) {
 	i := 99
 	type otherInt int
-	c.Assert(func() { testing.PatchValue(&i, otherInt(88)) }, gc.PanicMatches, `reflect\.Set: value of type testing_test\.otherInt is not assignable to type int`)
+	c.Assert(func() { testbase.PatchValue(&i, otherInt(88)) }, gc.PanicMatches, `reflect\.Set: value of type testbase_test\.otherInt is not assignable to type int`)
 }
 
 type PatchEnvironmentSuite struct{}
@@ -64,7 +67,7 @@
 	// remember the old value, and set it to something we can check
 	oldValue := os.Getenv(envName)
 	os.Setenv(envName, "initial")
-	restore := testing.PatchEnvironment(envName, "new value")
+	restore := testbase.PatchEnvironment(envName, "new value")
 	// Using check to make sure the environment gets set back properly in the test.
 	c.Check(os.Getenv(envName), gc.Equals, "new value")
 	restore()
 
=== modified file 'utils/fslock/fslock_test.go'
--- utils/fslock/fslock_test.go	2013-09-13 14:48:13 +0000
+++ utils/fslock/fslock_test.go	2013-09-20 02:56:01 +0000
@@ -17,6 +17,7 @@
 	"launchpad.net/tomb"
 
 	coretesting "launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 	"launchpad.net/juju-core/utils/fslock"
 )
 
@@ -25,7 +26,7 @@
 }
 
 type fslockSuite struct {
-	coretesting.LoggingSuite
+	testbase.LoggingSuite
 	lockDelay time.Duration
 }
 
 
=== modified file 'worker/deployer/simple_test.go'
--- worker/deployer/simple_test.go	2013-09-13 14:48:13 +0000
+++ worker/deployer/simple_test.go	2013-09-20 02:56:01 +0000
@@ -19,6 +19,7 @@
 	"launchpad.net/juju-core/names"
 	"launchpad.net/juju-core/testing"
 	jc "launchpad.net/juju-core/testing/checkers"
+	"launchpad.net/juju-core/testing/testbase"
 	"launchpad.net/juju-core/version"
 	"launchpad.net/juju-core/worker/deployer"
 )
@@ -129,7 +130,7 @@
 }
 
 type SimpleToolsFixture struct {
-	testing.LoggingSuite
+	testbase.LoggingSuite
 	dataDir         string
 	initDir         string
 	logDir          string
 
=== modified file 'worker/notifyworker_test.go'
--- worker/notifyworker_test.go	2013-08-28 14:03:08 +0000
+++ worker/notifyworker_test.go	2013-09-20 02:56:01 +0000
@@ -15,11 +15,12 @@
 	"launchpad.net/juju-core/state/watcher"
 	coretesting "launchpad.net/juju-core/testing"
 	jc "launchpad.net/juju-core/testing/checkers"
+	"launchpad.net/juju-core/testing/testbase"
 	"launchpad.net/juju-core/worker"
 )
 
 type notifyWorkerSuite struct {
-	coretesting.LoggingSuite
+	testbase.LoggingSuite
 	worker worker.Worker
 	actor  *notifyHandler
 }
 
=== modified file 'worker/provisioner/lxc-broker_test.go'
--- worker/provisioner/lxc-broker_test.go	2013-09-19 03:23:04 +0000
+++ worker/provisioner/lxc-broker_test.go	2013-09-20 02:56:01 +0000
@@ -27,13 +27,14 @@
 	"launchpad.net/juju-core/state"
 	coretesting "launchpad.net/juju-core/testing"
 	jc "launchpad.net/juju-core/testing/checkers"
+	"launchpad.net/juju-core/testing/testbase"
 	coretools "launchpad.net/juju-core/tools"
 	"launchpad.net/juju-core/version"
 	"launchpad.net/juju-core/worker/provisioner"
 )
 
 type lxcSuite struct {
-	coretesting.LoggingSuite
+	testbase.LoggingSuite
 	lxc.TestSuite
 	events chan mock.Event
 }
 
=== modified file 'worker/runner_test.go'
--- worker/runner_test.go	2013-08-19 11:20:02 +0000
+++ worker/runner_test.go	2013-09-20 02:56:01 +0000
@@ -12,12 +12,12 @@
 	gc "launchpad.net/gocheck"
 	"launchpad.net/tomb"
 
-	coretesting "launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/testing/testbase"
 	"launchpad.net/juju-core/worker"
 )
 
 type runnerSuite struct {
-	coretesting.LoggingSuite
+	testbase.LoggingSuite
 	restartDelay time.Duration
 }
 
 
=== modified file 'worker/stringsworker_test.go'
--- worker/stringsworker_test.go	2013-08-28 14:03:08 +0000
+++ worker/stringsworker_test.go	2013-09-20 02:56:01 +0000
@@ -15,11 +15,12 @@
 	"launchpad.net/juju-core/state/watcher"
 	coretesting "launchpad.net/juju-core/testing"
 	jc "launchpad.net/juju-core/testing/checkers"
+	"launchpad.net/juju-core/testing/testbase"
 	"launchpad.net/juju-core/worker"
 )
 
 type stringsWorkerSuite struct {
-	coretesting.LoggingSuite
+	testbase.LoggingSuite
 	worker worker.Worker
 	actor  *stringsHandler
 }
 
=== modified file 'worker/uniter/charm/git_test.go'
--- worker/uniter/charm/git_test.go	2013-09-19 02:17:33 +0000
+++ worker/uniter/charm/git_test.go	2013-09-20 02:56:01 +0000
@@ -14,6 +14,7 @@
 	corecharm "launchpad.net/juju-core/charm"
 	"launchpad.net/juju-core/testing"
 	jc "launchpad.net/juju-core/testing/checkers"
+	"launchpad.net/juju-core/testing/testbase"
 	"launchpad.net/juju-core/worker/uniter/charm"
 )
 
@@ -21,7 +22,7 @@
 
 type GitDirSuite struct {
 	testing.GitSuite
-	LoggingSuite testing.LoggingSuite
+	LoggingSuite testbase.LoggingSuite
 }
 
 var _ = gc.Suite(&GitDirSuite{})
 
=== modified file 'worker/uniter/debug/server_test.go'
--- worker/uniter/debug/server_test.go	2013-09-19 03:23:04 +0000
+++ worker/uniter/debug/server_test.go	2013-09-20 02:56:01 +0000
@@ -14,12 +14,12 @@
 
 	gc "launchpad.net/gocheck"
 
-	"launchpad.net/juju-core/testing"
 	jc "launchpad.net/juju-core/testing/checkers"
+	"launchpad.net/juju-core/testing/testbase"
 )
 
 type DebugHooksServerSuite struct {
-	testing.LoggingSuite
+	testbase.LoggingSuite
 	ctx     *HooksContext
 	fakebin string
 	tmpdir  string
 
=== modified file 'worker/uniter/jujuc/server_test.go'
--- worker/uniter/jujuc/server_test.go	2013-09-13 14:48:13 +0000
+++ worker/uniter/jujuc/server_test.go	2013-09-20 02:56:01 +0000
@@ -19,6 +19,7 @@
 	"launchpad.net/juju-core/cmd"
 	"launchpad.net/juju-core/testing"
 	jc "launchpad.net/juju-core/testing/checkers"
+	"launchpad.net/juju-core/testing/testbase"
 	"launchpad.net/juju-core/worker/uniter/jujuc"
 )
 
@@ -69,7 +70,7 @@
 }
 
 type ServerSuite struct {
-	testing.LoggingSuite
+	testbase.LoggingSuite
 	server   *jujuc.Server
 	sockPath string
 	err      chan error