summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-03-24 22:32:20 +0000
committerGerrit Code Review <review@openstack.org>2018-03-24 22:32:20 +0000
commit990e4d5e57af0eceb7211a18e0b3cc727e69ef75 (patch)
treef28c76c90e4d0aa5424c97beb03d050c1b59685f
parent0289eba5583ab05eacb442b71cef9b6ca5b435b5 (diff)
parent160af2464ee3e0a000492a233243fa18882f8407 (diff)
Merge "Remove inheritance of neutron UT"
-rw-r--r--networking_fujitsu/tests/unit/ml2/cfab/test_mech_cfab.py6
-rw-r--r--networking_fujitsu/tests/unit/ml2/fossw/test_mech_fossw.py5
2 files changed, 0 insertions, 11 deletions
diff --git a/networking_fujitsu/tests/unit/ml2/cfab/test_mech_cfab.py b/networking_fujitsu/tests/unit/ml2/cfab/test_mech_cfab.py
index 7d80cfd..9e68986 100644
--- a/networking_fujitsu/tests/unit/ml2/cfab/test_mech_cfab.py
+++ b/networking_fujitsu/tests/unit/ml2/cfab/test_mech_cfab.py
@@ -18,7 +18,6 @@ import os
18import mock 18import mock
19from neutron.conf.plugins.ml2 import config 19from neutron.conf.plugins.ml2 import config
20from neutron.plugins.ml2.common import exceptions as ml2_exc 20from neutron.plugins.ml2.common import exceptions as ml2_exc
21from neutron.tests.unit.plugins.ml2 import test_plugin as test_ml2_plugin
22from neutron_lib.api.definitions import portbindings as pb_def 21from neutron_lib.api.definitions import portbindings as pb_def
23 22
24from networking_fujitsu.ml2.cfab import cfabdriver 23from networking_fujitsu.ml2.cfab import cfabdriver
@@ -92,11 +91,6 @@ class TestFujitsuMechDriverV2(helper.FujitsuMechanismHelper):
92 super(TestFujitsuMechDriverV2, self).setUp() 91 super(TestFujitsuMechDriverV2, self).setUp()
93 92
94 93
95class TestFujitsuMechDriverPortsV2(test_ml2_plugin.TestMl2PortsV2,
96 TestFujitsuMechDriverV2):
97 pass
98
99
100class TestMechCFABIsSupported(TestFujitsuMechDriverV2): 94class TestMechCFABIsSupported(TestFujitsuMechDriverV2):
101 95
102 def test_is_supported_type_vlan(self): 96 def test_is_supported_type_vlan(self):
diff --git a/networking_fujitsu/tests/unit/ml2/fossw/test_mech_fossw.py b/networking_fujitsu/tests/unit/ml2/fossw/test_mech_fossw.py
index a116283..460b393 100644
--- a/networking_fujitsu/tests/unit/ml2/fossw/test_mech_fossw.py
+++ b/networking_fujitsu/tests/unit/ml2/fossw/test_mech_fossw.py
@@ -16,7 +16,6 @@
16import mock 16import mock
17from neutron.conf.plugins.ml2 import config 17from neutron.conf.plugins.ml2 import config
18from neutron.plugins.ml2.common import exceptions as ml2_exc 18from neutron.plugins.ml2.common import exceptions as ml2_exc
19from neutron.tests.unit.plugins.ml2 import test_plugin as test_ml2_plugin
20from oslo_config import cfg 19from oslo_config import cfg
21from oslo_utils import importutils 20from oslo_utils import importutils
22 21
@@ -61,10 +60,6 @@ class TestFujitsuMechDriverV2(helper.FujitsuMechanismHelper):
61 super(TestFujitsuMechDriverV2, self).setUp() 60 super(TestFujitsuMechDriverV2, self).setUp()
62 61
63 62
64class TestFujitsuMechDriverPortsV2(test_ml2_plugin.TestMl2PortsV2):
65 pass
66
67
68class TestFOSSWInitialize(helper.FujitsuMechanismHelper): 63class TestFOSSWInitialize(helper.FujitsuMechanismHelper):
69 64
70 def setUp(self): 65 def setUp(self):