tests: rename *WithMockCloudBackend to *WithCloudBackendAndMockContainer.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>

diff --git a/src/allmydata/test/test_crawler.py b/src/allmydata/test/test_crawler.py
index 2ad42a6cb70cc2a7a8569900ed164ecbd56c5585..7421467f28e5b1573844cc8b7ae1dc2b59c41f3a 100644 (file)
--- a/src/allmydata/test/test_crawler.py
+++ b/src/allmydata/test/test_crawler.py
@@ -264,6 +264,6 @@ class CrawlerTestWithDiskBackend(CrawlerTest, unittest.TestCase):
         return DiskBackend(basedir)
 
 
-class CrawlerTestWithMockCloudBackend(CrawlerTest, unittest.TestCase):
+class CrawlerTestWithCloudBackendAndMockContainer(CrawlerTest, unittest.TestCase):
     def make_backend(self, basedir):
         return CloudBackend(MockContainer(basedir))

diff --git a/src/allmydata/test/test_storage.py b/src/allmydata/test/test_storage.py
index e4fd533eaade62b2c3dd7ec4448a30deae6d6ad0..d84a45a3a1d48828a3bb620db4f4a92843322981 100644 (file)
--- a/src/allmydata/test/test_storage.py
+++ b/src/allmydata/test/test_storage.py
@@ -2879,7 +2879,7 @@ class ServerWithNullBackend(ServiceParentMixin, WorkdirMixin, ServerMixin, unitt
         return d
 
 
-class WithMockCloudBackend(ServiceParentMixin, WorkdirMixin):
+class WithCloudBackendAndMockContainer(ServiceParentMixin, WorkdirMixin):
     def create(self, name, detached=False, readonly=False, reserved_space=0, klass=StorageServer):
         assert not readonly
         workdir = self.workdir(name)
@@ -2922,7 +2922,7 @@ class WithDiskBackend(ServiceParentMixin, WorkdirMixin):
         return MutableDiskShare
 
 
-class ServerWithMockCloudBackend(WithMockCloudBackend, ServerTest, unittest.TestCase):
+class ServerWithCloudBackendAndMockContainer(WithCloudBackendAndMockContainer, ServerTest, unittest.TestCase):
     def setUp(self):
         ServiceParentMixin.setUp(self)
 
@@ -3300,7 +3300,7 @@ class ServerWithDiskBackend(WithDiskBackend, ServerTest, unittest.TestCase):
         return d
 
 
-class MutableServerWithMockCloudBackend(WithMockCloudBackend, MutableServerTest, unittest.TestCase):
+class MutableServerWithCloudBackendAndMockContainer(WithCloudBackendAndMockContainer, MutableServerTest, unittest.TestCase):
     def setUp(self):
         ServiceParentMixin.setUp(self)
 
@@ -5457,7 +5457,7 @@ class AccountingCrawlerWithDiskBackend(WithDiskBackend, AccountingCrawlerTest, u
     pass
 
 
-#class AccountingCrawlerWithMockCloudBackend(WithMockCloudBackend, AccountingCrawlerTest, unittest.TestCase):
+#class AccountingCrawlerWithCloudBackendAndMockContainer(WithCloudBackendAndMockContainer, AccountingCrawlerTest, unittest.TestCase):
 #    pass
 
 
@@ -5589,7 +5589,7 @@ class WebStatusWithDiskBackend(WithDiskBackend, WebRenderingMixin, unittest.Test
         self.failUnlessEqual(remove_prefix("foo.bar", "baz."), None)
 
 
-class WebStatusWithMockCloudBackend(WithMockCloudBackend, WebRenderingMixin, unittest.TestCase):
+class WebStatusWithCloudBackendAndMockContainer(WithCloudBackendAndMockContainer, WebRenderingMixin, unittest.TestCase):
     def test_status(self):
         server = self.create("test_status")
 

diff --git a/src/allmydata/test/test_system.py b/src/allmydata/test/test_system.py
index 51ae3658aa8b1eaab84ff6f6ae469f756cc1f057..b36aa7f32420fcaee8490dd27e73053f9b99175d 100644 (file)
--- a/src/allmydata/test/test_system.py
+++ b/src/allmydata/test/test_system.py
@@ -1949,7 +1949,7 @@ class SystemWithDiskBackend(SystemTest, unittest.TestCase):
         pass
 
 
-class SystemWithMockCloudBackend(SystemTest, unittest.TestCase):
+class SystemWithCloudBackendAndMockContainer(SystemTest, unittest.TestCase):
     def setUp(self):
         SystemTest.setUp(self)