Merge "Make test_nova_manage pass with CONF.use_neutron=True by default"

This commit is contained in:
Jenkins
2017-01-04 17:41:44 +00:00
committed by Gerrit Code Review

View File

@@ -83,6 +83,8 @@ class FloatingIpCommandsTestCase(test.NoDBTestCase):
class NetworkCommandsTestCase(test.NoDBTestCase): class NetworkCommandsTestCase(test.NoDBTestCase):
def setUp(self): def setUp(self):
super(NetworkCommandsTestCase, self).setUp() super(NetworkCommandsTestCase, self).setUp()
# These are all tests that assume nova-network and using the nova DB.
self.flags(use_neutron=False)
self.output = StringIO() self.output = StringIO()
self.useFixture(fixtures.MonkeyPatch('sys.stdout', self.output)) self.useFixture(fixtures.MonkeyPatch('sys.stdout', self.output))
self.commands = manage.NetworkCommands() self.commands = manage.NetworkCommands()