]> git.rkrishnan.org Git - tahoe-lafs/tahoe-lafs.git/commitdiff
tests: rename *WithMockCloudBackend to *WithCloudBackendAndMockContainer.
authorDaira Hopwood <daira@jacaranda.org>
Tue, 8 Apr 2014 22:05:58 +0000 (23:05 +0100)
committerDaira Hopwood <daira@jacaranda.org>
Tue, 4 Aug 2015 18:10:29 +0000 (19:10 +0100)
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
src/allmydata/test/test_crawler.py
src/allmydata/test/test_storage.py
src/allmydata/test/test_system.py

index 2ad42a6cb70cc2a7a8569900ed164ecbd56c5585..7421467f28e5b1573844cc8b7ae1dc2b59c41f3a 100644 (file)
@@ -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))
index 121cec89f49276cee60673ab27ff7b573fee6fbb..706e1ecf4ea4df199a1541501aaaa448da7fc2f0 100644 (file)
@@ -2894,7 +2894,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)
@@ -2937,7 +2937,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)
 
@@ -3314,7 +3314,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)
 
@@ -5471,7 +5471,7 @@ class AccountingCrawlerWithDiskBackend(WithDiskBackend, AccountingCrawlerTest, u
     pass
 
 
-#class AccountingCrawlerWithMockCloudBackend(WithMockCloudBackend, AccountingCrawlerTest, unittest.TestCase):
+#class AccountingCrawlerWithCloudBackendAndMockContainer(WithCloudBackendAndMockContainer, AccountingCrawlerTest, unittest.TestCase):
 #    pass
 
 
@@ -5607,7 +5607,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")
 
index 93b6126748edbf3a72b593c90f0aa1d890f9bf6e..cf4a67a6157a67f0982457016a8c4e175d602845 100644 (file)
@@ -1938,7 +1938,7 @@ class SystemWithDiskBackend(SystemTest, unittest.TestCase):
         pass
 
 
-class SystemWithMockCloudBackend(SystemTest, unittest.TestCase):
+class SystemWithCloudBackendAndMockContainer(SystemTest, unittest.TestCase):
     def setUp(self):
         SystemTest.setUp(self)