From 080719c2464a45076bdc49844a9e3fde7d8d187e Mon Sep 17 00:00:00 2001 From: Daira Hopwood Date: Tue, 8 Apr 2014 23:05:58 +0100 Subject: [PATCH] tests: rename *WithMockCloudBackend to *WithCloudBackendAndMockContainer. Signed-off-by: Daira Hopwood --- src/allmydata/test/test_crawler.py | 2 +- src/allmydata/test/test_storage.py | 10 +++++----- src/allmydata/test/test_system.py | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/allmydata/test/test_crawler.py b/src/allmydata/test/test_crawler.py index 2ad42a6c..7421467f 100644 --- 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 121cec89..706e1ecf 100644 --- a/src/allmydata/test/test_storage.py +++ b/src/allmydata/test/test_storage.py @@ -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") diff --git a/src/allmydata/test/test_system.py b/src/allmydata/test/test_system.py index 93b61267..cf4a67a6 100644 --- a/src/allmydata/test/test_system.py +++ b/src/allmydata/test/test_system.py @@ -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) -- 2.45.2