summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorMonty Taylor <mordred@inaugust.com>2012-11-09 15:49:51 +0100
committerMonty Taylor <mordred@inaugust.com>2012-12-07 23:14:58 -0800
commit70965c3ec5a562200fa414aa25a0a8bc99d20d90 (patch)
tree59cab6958f2f328d7c35475c9d499d356e806c5e /bin
parent86cc905734f81c5363c1dc86ea2bba662bb18892 (diff)
Use fixtures library for nova test fixtures.
Moving the test-case setup and teardown code into managed fixtures so that we can better interact with them when we start running things in parallel. Part of blueprint grizzly-testtools Change-Id: I406be0a88b14c0dba2d22b4957e26a53442bbae3
Diffstat (limited to 'bin')
-rwxr-xr-xbin/nova-dhcpbridge2
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/nova-dhcpbridge b/bin/nova-dhcpbridge
index 8ff2fac49..0e3d89e65 100755
--- a/bin/nova-dhcpbridge
+++ b/bin/nova-dhcpbridge
@@ -103,7 +103,7 @@ def main():
logging.setup("nova")
if int(os.environ.get('TESTING', '0')):
- from nova.tests import fake_flags
+ from nova.tests import conf_fixture
action = argv[1]
if action in ['add', 'del', 'old']: