Skip to content

Commit 2e53c82

Browse files
committed
tests: Move ConfFixture
This can go into the 'nova.tests.fixture' module also. Change-Id: I31743a9e813e69f2342bcb148f632c8729ac7000 Signed-off-by: Stephen Finucane <[email protected]>
1 parent d726ef5 commit 2e53c82

File tree

5 files changed

+12
-14
lines changed

5 files changed

+12
-14
lines changed

nova/test.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@
6262
from nova.objects import base as objects_base
6363
from nova import quota
6464
from nova.tests import fixtures as nova_fixtures
65-
from nova.tests.unit import conf_fixture
6665
from nova.tests.unit import matchers
6766
from nova.tests.unit import policy_fixture
6867
from nova import utils
@@ -206,7 +205,7 @@ def setUp(self):
206205
self.fixture.config(lock_path=lock_path,
207206
group='oslo_concurrency')
208207

209-
self.useFixture(conf_fixture.ConfFixture(CONF))
208+
self.useFixture(nova_fixtures.ConfFixture(CONF))
210209

211210
if self.STUB_RPC:
212211
self.useFixture(nova_fixtures.RPCFixture('nova.test'))

nova/tests/fixtures/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,5 @@
1010
# License for the specific language governing permissions and limitations
1111
# under the License.
1212

13+
from .conf import * # noqa: F401, F403
1314
from .nova import * # noqa: F401, F403
File renamed without changes.

nova/tests/unit/api/openstack/test_requestlog.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import testtools
2020

2121
from nova.tests import fixtures
22-
from nova.tests.unit import conf_fixture
2322

2423
"""Test request logging middleware under various conditions.
2524
@@ -59,7 +58,7 @@ def test_logs_requests(self, emit):
5958
"""
6059

6160
emit.return_value = True
62-
self.useFixture(conf_fixture.ConfFixture())
61+
self.useFixture(fixtures.ConfFixture())
6362
self.useFixture(fixtures.RPCFixture('nova.test'))
6463
api = self.useFixture(fixtures.OSAPIFixture()).api
6564

@@ -83,7 +82,7 @@ def test_logs_mv(self, emit):
8382
"""
8483

8584
emit.return_value = True
86-
self.useFixture(conf_fixture.ConfFixture())
85+
self.useFixture(fixtures.ConfFixture())
8786
# NOTE(sdague): all these tests are using the
8887
self.useFixture(
8988
fx.MonkeyPatch(
@@ -115,7 +114,7 @@ def test_logs_under_exception(self, emit, v_index):
115114

116115
emit.return_value = True
117116
v_index.side_effect = Exception("Unexpected Error")
118-
self.useFixture(conf_fixture.ConfFixture())
117+
self.useFixture(fixtures.ConfFixture())
119118
self.useFixture(fixtures.RPCFixture('nova.test'))
120119
api = self.useFixture(fixtures.OSAPIFixture()).api
121120

@@ -137,7 +136,7 @@ def test_no_log_under_eventlet(self, emit):
137136
"""
138137

139138
emit.return_value = False
140-
self.useFixture(conf_fixture.ConfFixture())
139+
self.useFixture(fixtures.ConfFixture())
141140
self.useFixture(fixtures.RPCFixture('nova.test'))
142141
api = self.useFixture(fixtures.OSAPIFixture()).api
143142

nova/tests/unit/test_fixtures.py

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
from nova.objects import service as service_obj
4343
from nova import test
4444
from nova.tests import fixtures
45-
from nova.tests.unit import conf_fixture
4645
from nova.tests.unit import fake_instance
4746
from nova import utils
4847

@@ -95,7 +94,7 @@ def test_responds_to_version(self, mock_service_create, mock_get):
9594
"""Ensure the OSAPI server responds to calls sensibly."""
9695
self.useFixture(output.CaptureOutput())
9796
self.useFixture(fixtures.StandardLogging())
98-
self.useFixture(conf_fixture.ConfFixture())
97+
self.useFixture(fixtures.ConfFixture())
9998
self.useFixture(fixtures.RPCFixture('nova.test'))
10099
api = self.useFixture(fixtures.OSAPIFixture()).api
101100

@@ -120,7 +119,7 @@ def test_responds_to_version(self, mock_service_create, mock_get):
120119
class TestDatabaseFixture(testtools.TestCase):
121120
def test_fixture_reset(self):
122121
# because this sets up reasonable db connection strings
123-
self.useFixture(conf_fixture.ConfFixture())
122+
self.useFixture(fixtures.ConfFixture())
124123
self.useFixture(fixtures.Database())
125124
engine = session.get_engine()
126125
conn = engine.connect()
@@ -151,7 +150,7 @@ def test_fixture_reset(self):
151150

152151
def test_api_fixture_reset(self):
153152
# This sets up reasonable db connection strings
154-
self.useFixture(conf_fixture.ConfFixture())
153+
self.useFixture(fixtures.ConfFixture())
155154
self.useFixture(fixtures.Database(database='api'))
156155
engine = session.get_api_engine()
157156
conn = engine.connect()
@@ -179,7 +178,7 @@ def test_api_fixture_reset(self):
179178

180179
def test_fixture_cleanup(self):
181180
# because this sets up reasonable db connection strings
182-
self.useFixture(conf_fixture.ConfFixture())
181+
self.useFixture(fixtures.ConfFixture())
183182
fix = fixtures.Database()
184183
self.useFixture(fix)
185184

@@ -194,7 +193,7 @@ def test_fixture_cleanup(self):
194193

195194
def test_api_fixture_cleanup(self):
196195
# This sets up reasonable db connection strings
197-
self.useFixture(conf_fixture.ConfFixture())
196+
self.useFixture(fixtures.ConfFixture())
198197
fix = fixtures.Database(database='api')
199198
self.useFixture(fix)
200199

@@ -221,7 +220,7 @@ def test_api_fixture_cleanup(self):
221220
class TestDefaultFlavorsFixture(testtools.TestCase):
222221
@mock.patch("nova.objects.flavor.Flavor._send_notification")
223222
def test_flavors(self, mock_send_notification):
224-
self.useFixture(conf_fixture.ConfFixture())
223+
self.useFixture(fixtures.ConfFixture())
225224
self.useFixture(fixtures.Database())
226225
self.useFixture(fixtures.Database(database='api'))
227226

0 commit comments

Comments
 (0)