More changes

sdg0919 · Sep 20, 2013 · ad99925 · ad99925
1 parent 2eace84
commit ad99925
Show file tree

Hide file tree

Showing 50 changed files with 57 additions and 57 deletions.
diff --git a/charm/repo_test.go b/charm/repo_test.go
@@ -172,7 +172,7 @@ func (s *StoreSuite) SetUpTest(c *gc.C) {
 	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

diff --git a/downloader/downloader_test.go b/downloader/downloader_test.go
@@ -17,7 +17,7 @@ import (
 )
 
 type suite struct {
-	testing.LoggingSuite
+	testbase.LoggingSuite
 	testing.HTTPSuite
 }
 

diff --git a/environs/simplestreams/testing/testing.go b/environs/simplestreams/testing/testing.go
@@ -392,7 +392,7 @@ func AssertExpectedSources(c *gc.C, obtained []simplestreams.DataSource, baseURL
 }
 
 type LocalLiveSimplestreamsSuite struct {
-	testing.LoggingSuite
+	testbase.LoggingSuite
 	Source          simplestreams.DataSource
 	RequireSigned   bool
 	DataType        string

diff --git a/environs/sshstorage/storage_test.go b/environs/sshstorage/storage_test.go
@@ -26,7 +26,7 @@ import (
 )
 
 type storageSuite struct {
-	testing.LoggingSuite
+	testbase.LoggingSuite
 	restoreEnv func()
 }
 

diff --git a/environs/sync/sync_test.go b/environs/sync/sync_test.go
@@ -34,7 +34,7 @@ func TestPackage(t *testing.T) {
 }
 
 type syncSuite struct {
-	coretesting.LoggingSuite
+	coretestbase.LoggingSuite
 	envtesting.ToolsFixture
 	home         *coretesting.FakeHome
 	targetEnv    environs.Environ
@@ -241,7 +241,7 @@ func assertToolsList(c *gc.C, list coretools.List, expected []version.Binary) {
 
 type uploadSuite struct {
 	env environs.Environ
-	coretesting.LoggingSuite
+	coretestbase.LoggingSuite
 	envtesting.ToolsFixture
 }
 

diff --git a/environs/tools/build_test.go b/environs/tools/build_test.go
@@ -16,7 +16,7 @@ import (
 )
 
 type buildSuite struct {
-	testing.LoggingSuite
+	testbase.LoggingSuite
 	restore  func()
 	cwd      string
 	filePath string

diff --git a/environs/tools/storage_test.go b/environs/tools/storage_test.go
@@ -18,7 +18,7 @@ import (
 
 type StorageSuite struct {
 	env environs.Environ
-	testing.LoggingSuite
+	testbase.LoggingSuite
 	dataDir string
 }
 

diff --git a/environs/tools/tools_test.go b/environs/tools/tools_test.go
@@ -40,7 +40,7 @@ type toolsTestHelper interface {
 type ToolsSuite struct {
 	toolsTestHelper
 	env environs.Environ
-	testing.LoggingSuite
+	testbase.LoggingSuite
 	envtesting.ToolsFixture
 	origCurrentVersion version.Binary
 }

diff --git a/environs/tools/validation_test.go b/environs/tools/validation_test.go
@@ -12,7 +12,7 @@ import (
 )
 
 type ValidateSuite struct {
-	coretesting.LoggingSuite
+	coretestbase.LoggingSuite
 	home *coretesting.FakeHome
 }
 

diff --git a/instance/address_test.go b/instance/address_test.go
@@ -13,7 +13,7 @@ import (
 )
 
 type AddressSuite struct {
-	testing.LoggingSuite
+	testbase.LoggingSuite
 }
 
 var _ = gc.Suite(&AddressSuite{})

diff --git a/juju/apiconn_test.go b/juju/apiconn_test.go
@@ -23,7 +23,7 @@ import (
 )
 
 type NewAPIConnSuite struct {
-	coretesting.LoggingSuite
+	coretestbase.LoggingSuite
 	envtesting.ToolsFixture
 }
 
@@ -58,7 +58,7 @@ func (*NewAPIConnSuite) TestNewConn(c *gc.C) {
 }
 
 type NewAPIClientSuite struct {
-	coretesting.LoggingSuite
+	coretestbase.LoggingSuite
 }
 
 var _ = gc.Suite(&NewAPIClientSuite{})

diff --git a/juju/conn_test.go b/juju/conn_test.go
@@ -36,7 +36,7 @@ func Test(t *stdtesting.T) {
 }
 
 type NewConnSuite struct {
-	coretesting.LoggingSuite
+	coretestbase.LoggingSuite
 	envtesting.ToolsFixture
 }
 
@@ -222,7 +222,7 @@ func (cs *NewConnSuite) TestConnWithPassword(c *gc.C) {
 }
 
 type ConnSuite struct {
-	coretesting.LoggingSuite
+	coretestbase.LoggingSuite
 	coretesting.MgoSuite
 	envtesting.ToolsFixture
 	conn *juju.Conn

diff --git a/juju/testing/conn.go b/juju/testing/conn.go
@@ -32,7 +32,7 @@ import (
 )
 
 // 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 +50,7 @@ type JujuConnSuite struct {
 	// /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

diff --git a/provider/azure/azure_test.go b/provider/azure/azure_test.go
@@ -17,7 +17,7 @@ func TestAzureProvider(t *stdtesting.T) {
 }
 
 type providerSuite struct {
-	testing.LoggingSuite
+	testbase.LoggingSuite
 	envtesting.ToolsFixture
 	restoreTimeouts func()
 }

diff --git a/provider/azure/config_test.go b/provider/azure/config_test.go
@@ -14,7 +14,7 @@ import (
 )
 
 type configSuite struct {
-	testing.LoggingSuite
+	testbase.LoggingSuite
 }
 
 var _ = gc.Suite(&configSuite{})

diff --git a/provider/azure/customdata_test.go b/provider/azure/customdata_test.go
@@ -18,7 +18,7 @@ import (
 )
 
 type customDataSuite struct {
-	testing.LoggingSuite
+	testbase.LoggingSuite
 }
 
 var _ = gc.Suite(&customDataSuite{})

diff --git a/provider/ec2/config_test.go b/provider/ec2/config_test.go
@@ -23,7 +23,7 @@ import (
 // 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
 }
 

diff --git a/provider/ec2/image_test.go b/provider/ec2/image_test.go
@@ -14,7 +14,7 @@ import (
 )
 
 type imageSuite struct {
-	testing.LoggingSuite
+	testbase.LoggingSuite
 }
 
 var _ = gc.Suite(&imageSuite{})
@@ -30,7 +30,7 @@ func (s *imageSuite) TearDownSuite(c *gc.C) {
 }
 
 type specSuite struct {
-	testing.LoggingSuite
+	testbase.LoggingSuite
 }
 
 var _ = gc.Suite(&specSuite{})

diff --git a/provider/ec2/live_test.go b/provider/ec2/live_test.go
@@ -72,7 +72,7 @@ func registerAmazonTests() {
 // LiveTests contains tests that can be run against the Amazon servers.
 // Each test runs using the same ec2 connection.
 type LiveTests struct {
-	coretesting.LoggingSuite
+	coretestbase.LoggingSuite
 	jujutest.LiveTests
 	writablePublicStorage storage.Storage
 }

diff --git a/provider/ec2/local_test.go b/provider/ec2/local_test.go
@@ -372,7 +372,7 @@ func (t *localServerSuite) TestGetToolsMetadataSources(c *gc.C) {
 // 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

diff --git a/provider/local/environprovider_test.go b/provider/local/environprovider_test.go
@@ -13,7 +13,7 @@ import (
 )
 
 type baseProviderSuite struct {
-	testing.LoggingSuite
+	testbase.LoggingSuite
 	lxc.TestSuite
 	home    *testing.FakeHome
 	restore func()

diff --git a/provider/local/local_test.go b/provider/local/local_test.go
@@ -19,7 +19,7 @@ func TestLocal(t *stdtesting.T) {
 }
 
 type localSuite struct {
-	testing.LoggingSuite
+	testbase.LoggingSuite
 }
 
 var _ = gc.Suite(&localSuite{})

diff --git a/provider/local/prereqs_test.go b/provider/local/prereqs_test.go
@@ -14,7 +14,7 @@ import (
 )
 
 type prereqsSuite struct {
-	testing.LoggingSuite
+	testbase.LoggingSuite
 	tmpdir  string
 	oldpath string
 }

diff --git a/provider/maas/config_test.go b/provider/maas/config_test.go
@@ -11,7 +11,7 @@ import (
 )
 
 type configSuite struct {
-	testing.LoggingSuite
+	testbase.LoggingSuite
 }
 
 var _ = gc.Suite(&configSuite{})

diff --git a/provider/maas/maas_test.go b/provider/maas/maas_test.go
@@ -18,7 +18,7 @@ func TestMAAS(t *stdtesting.T) {
 }
 
 type providerSuite struct {
-	testing.LoggingSuite
+	testbase.LoggingSuite
 	envtesting.ToolsFixture
 	environ         *maasEnviron
 	testMAASObject  *gomaasapi.TestMAASObject

diff --git a/provider/openstack/config_test.go b/provider/openstack/config_test.go
@@ -18,7 +18,7 @@ import (
 )
 
 type ConfigSuite struct {
-	testing.LoggingSuite
+	testbase.LoggingSuite
 	savedVars   map[string]string
 	oldJujuHome *testing.FakeHome
 }

diff --git a/provider/openstack/live_test.go b/provider/openstack/live_test.go
@@ -72,7 +72,7 @@ func registerLiveTests(cred *identity.Credentials) {
 // The deployment can be a real live instance or service doubles.
 // Each test runs using the same connection.
 type LiveTests struct {
-	coretesting.LoggingSuite
+	coretestbase.LoggingSuite
 	jujutest.LiveTests
 	cred                   *identity.Credentials
 	writeablePublicStorage storage.Storage

diff --git a/provider/openstack/local_test.go b/provider/openstack/local_test.go
@@ -149,7 +149,7 @@ func (s *localServer) stop() {
 
 // localLiveSuite runs tests from LiveTests using an Openstack service double.
 type localLiveSuite struct {
-	coretesting.LoggingSuite
+	coretestbase.LoggingSuite
 	LiveTests
 	srv localServer
 }
@@ -184,7 +184,7 @@ func (s *localLiveSuite) TearDownTest(c *gc.C) {
 // to test on a live Openstack server. The service double is started and stopped for
 // each test.
 type localServerSuite struct {
-	coretesting.LoggingSuite
+	coretestbase.LoggingSuite
 	jujutest.Tests
 	cred                   *identity.Credentials
 	srv                    localServer

diff --git a/provider/state_test.go b/provider/state_test.go
@@ -21,7 +21,7 @@ import (
 )
 
 type StateSuite struct {
-	testing.LoggingSuite
+	testbase.LoggingSuite
 }
 
 var _ = gc.Suite(&StateSuite{})

diff --git a/rpc/jsoncodec/codec_test.go b/rpc/jsoncodec/codec_test.go
@@ -16,7 +16,7 @@ import (
 )
 
 type suite struct {
-	testing.LoggingSuite
+	testbase.LoggingSuite
 }
 
 var _ = gc.Suite(&suite{})

diff --git a/rpc/rpc_test.go b/rpc/rpc_test.go
@@ -21,7 +21,7 @@ import (
 )
 
 type suite struct {
-	testing.LoggingSuite
+	testbase.LoggingSuite
 }
 
 var _ = gc.Suite(&suite{})

diff --git a/state/apiserver/common/errors_test.go b/state/apiserver/common/errors_test.go
@@ -17,7 +17,7 @@ import (
 )
 
 type errorsSuite struct {
-	testing.LoggingSuite
+	testbase.LoggingSuite
 }
 
 var _ = gc.Suite(&errorsSuite{})

diff --git a/state/conn_test.go b/state/conn_test.go
@@ -22,7 +22,7 @@ func TestPackage(t *stdtesting.T) {
 // test suites (StateSuite, CharmSuite, MachineSuite, etc).
 type ConnSuite struct {
 	testing.MgoSuite
-	testing.LoggingSuite
+	testbase.LoggingSuite
 	annotations *mgo.Collection
 	charms      *mgo.Collection
 	machines    *mgo.Collection

diff --git a/state/initialize_test.go b/state/initialize_test.go
@@ -16,7 +16,7 @@ import (
 
 type InitializeSuite struct {
 	testing.MgoSuite
-	testing.LoggingSuite
+	testbase.LoggingSuite
 	State *state.State
 }
 

diff --git a/state/megawatcher_internal_test.go b/state/megawatcher_internal_test.go
@@ -28,7 +28,7 @@ options:
 `
 
 type storeManagerStateSuite struct {
-	testing.LoggingSuite
+	testbase.LoggingSuite
 	testing.MgoSuite
 	State *State
 }

diff --git a/state/multiwatcher/multiwatcher_internal_test.go b/state/multiwatcher/multiwatcher_internal_test.go
@@ -24,7 +24,7 @@ func Test(t *stdtesting.T) {
 }
 
 type storeSuite struct {
-	testing.LoggingSuite
+	testbase.LoggingSuite
 }
 
 var _ = gc.Suite(&storeSuite{})
@@ -270,7 +270,7 @@ func (s *storeSuite) TestGet(c *gc.C) {
 }
 
 type storeManagerSuite struct {
-	testing.LoggingSuite
+	testbase.LoggingSuite
 }
 
 var _ = gc.Suite(&storeManagerSuite{})

diff --git a/state/presence/presence_test.go b/state/presence/presence_test.go
@@ -22,7 +22,7 @@ func TestPackage(t *stdtesting.T) {
 
 type PresenceSuite struct {
 	testing.MgoSuite
-	testing.LoggingSuite
+	testbase.LoggingSuite
 	presence *mgo.Collection
 	pings    *mgo.Collection
 }