From f181d4b2a6ed224234541940f88e4259e39bca11 Mon Sep 17 00:00:00 2001 From: Julien Danjou Date: Fri, 13 May 2016 10:10:06 +0200 Subject: [PATCH] tests: create common resources at class init time This should save a bit of time. Change-Id: Ia43ee874f5d55e93fe96f2c5a352a4bd01912407 --- gnocchi/gendoc.py | 1 + gnocchi/tests/base.py | 17 ++++++++++------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/gnocchi/gendoc.py b/gnocchi/gendoc.py index 63a4e9b13..b3db9e5eb 100644 --- a/gnocchi/gendoc.py +++ b/gnocchi/gendoc.py @@ -32,6 +32,7 @@ _RUN = False def _setup_test_app(): t = test_rest.RestTest() t.auth = True + t.setUpClass() t.setUp() return t.app diff --git a/gnocchi/tests/base.py b/gnocchi/tests/base.py index 283e18d38..30704f711 100644 --- a/gnocchi/tests/base.py +++ b/gnocchi/tests/base.py @@ -374,8 +374,9 @@ class TestCase(base.BaseTestCase): return os.path.join(root, project_file) return root - def setUp(self): - super(TestCase, self).setUp() + @classmethod + def setUpClass(self): + super(TestCase, self).setUpClass() self.conf = service.prepare_service([], default_config_files=[]) self.conf.set_override('policy_file', @@ -410,6 +411,13 @@ class TestCase(base.BaseTestCase): except indexer.ArchivePolicyAlreadyExists: pass + self.conf.set_override( + 'driver', + os.getenv("GNOCCHI_TEST_STORAGE_DRIVER", "null"), + 'storage') + + def setUp(self): + super(TestCase, self).setUp() if swexc: self.useFixture(mockpatch.Patch( 'swiftclient.client.Connection', @@ -418,11 +426,6 @@ class TestCase(base.BaseTestCase): self.useFixture(mockpatch.Patch('gnocchi.storage.ceph.rados', FakeRadosModule())) - self.conf.set_override( - 'driver', - os.getenv("GNOCCHI_TEST_STORAGE_DRIVER", "null"), - 'storage') - if self.conf.storage.driver == 'file': tempdir = self.useFixture(fixtures.TempDir()) self.conf.set_override('file_basepath',