From 6d5dc8677b9a7f13c5201fac4d5f6496d0dc40f2 Mon Sep 17 00:00:00 2001 From: IWAMOTO Toshihiro Date: Thu, 10 Aug 2017 16:28:59 +0900 Subject: [PATCH] fullstack: Actually run ovsfw tests super(...).setUp() must be called before OVSVersionChecker so that rootwrap gets configured first. Change-Id: Ie152f64a598a68566e36a4903017132e03eb35a6 Closes-bug: #1709547 --- neutron/tests/fullstack/test_securitygroup.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/neutron/tests/fullstack/test_securitygroup.py b/neutron/tests/fullstack/test_securitygroup.py index e89346ac836..c7e03cb6104 100644 --- a/neutron/tests/fullstack/test_securitygroup.py +++ b/neutron/tests/fullstack/test_securitygroup.py @@ -43,10 +43,6 @@ class BaseSecurityGroupsSameNetworkTest(base.BaseFullStackTestCase): ovsdb_interface = None def setUp(self): - if (self.firewall_driver == 'openvswitch' and - not OVSVersionChecker.supports_ovsfirewall()): - self.skipTest("Open vSwitch firewall_driver doesn't work " - "with this version of ovs.") host_descriptions = [ environment.HostDescription( of_interface=self.of_interface, @@ -60,6 +56,11 @@ class BaseSecurityGroupsSameNetworkTest(base.BaseFullStackTestCase): host_descriptions) super(BaseSecurityGroupsSameNetworkTest, self).setUp(env) + if (self.firewall_driver == 'openvswitch' and + not OVSVersionChecker.supports_ovsfirewall()): + self.skipTest("Open vSwitch firewall_driver doesn't work " + "with this version of ovs.") + def assert_connection(self, *args, **kwargs): netcat = net_helpers.NetcatTester(*args, **kwargs) try: