Allow tox to run plugin specific unit tests

Fixes bug 1041316 This patch covers linuxbridge, nec, nicira, and ryu plugins. Change-Id: I024a46bc9b49ffe60cdbe9fa275f30ac9d829a9a
openstack · Aug 24, 2012 · f1d022c · f1d022c
1 parent 734213b
commit f1d022c
Show file tree

Hide file tree

Showing 41 changed files with 43 additions and 852 deletions.
diff --git a/quantum/plugins/linuxbridge/run_tests.py b/quantum/plugins/linuxbridge/run_tests.py
diff --git a/quantum/plugins/linuxbridge/tests/__init__.py b/quantum/plugins/linuxbridge/tests/__init__.py
diff --git a/quantum/plugins/linuxbridge/tests/unit/__init__.py b/quantum/plugins/linuxbridge/tests/unit/__init__.py
diff --git a/quantum/plugins/linuxbridge/tests/unit/_test_linuxbridgeAgent.py b/quantum/plugins/linuxbridge/tests/unit/_test_linuxbridgeAgent.py
diff --git a/quantum/plugins/nec/run_tests.py b/quantum/plugins/nec/run_tests.py
diff --git a/quantum/plugins/nicira/nicira_nvp_plugin/run_tests.py b/quantum/plugins/nicira/nicira_nvp_plugin/run_tests.py
diff --git a/quantum/plugins/ryu/run_tests.py b/quantum/plugins/ryu/run_tests.py
diff --git a/quantum/plugins/ryu/tests/__init__.py b/quantum/plugins/ryu/tests/__init__.py
diff --git a/quantum/plugins/ryu/tests/unit/__init__.py b/quantum/plugins/ryu/tests/unit/__init__.py
diff --git a/quantum/plugins/nec/tests/unit/__init__.py → quantum/tests/unit/linuxbridge/__init__.py b/quantum/plugins/nec/tests/unit/__init__.py → quantum/tests/unit/linuxbridge/__init__.py
@@ -1,6 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
-#
-# Copyright 2012 NEC Corporation.  All rights reserved.
+
+# Copyright 2012 OpenStack LLC.
+# All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain

diff --git a/...s/linuxbridge/tests/unit/test_defaults.py → ...m/tests/unit/linuxbridge/test_defaults.py b/...s/linuxbridge/tests/unit/test_defaults.py → ...m/tests/unit/linuxbridge/test_defaults.py
diff --git a/...gins/linuxbridge/tests/unit/test_lb_db.py → quantum/tests/unit/linuxbridge/test_lb_db.py b/...gins/linuxbridge/tests/unit/test_lb_db.py → quantum/tests/unit/linuxbridge/test_lb_db.py
diff --git a/...tum/tests/unit/test_linuxbridge_plugin.py → ...it/linuxbridge/test_linuxbridge_plugin.py b/...tum/tests/unit/test_linuxbridge_plugin.py → ...it/linuxbridge/test_linuxbridge_plugin.py
diff --git a/...ins/linuxbridge/tests/unit/test_rpcapi.py → ...tum/tests/unit/linuxbridge/test_rpcapi.py b/...ins/linuxbridge/tests/unit/test_rpcapi.py → ...tum/tests/unit/linuxbridge/test_rpcapi.py
diff --git a/quantum/plugins/nec/tests/__init__.py → quantum/tests/unit/nec/__init__.py b/quantum/plugins/nec/tests/__init__.py → quantum/tests/unit/nec/__init__.py
diff --git a/...plugins/nec/tests/unit/stub_ofc_driver.py → quantum/tests/unit/nec/stub_ofc_driver.py b/...plugins/nec/tests/unit/stub_ofc_driver.py → quantum/tests/unit/nec/stub_ofc_driver.py
diff --git a/...tum/plugins/nec/tests/unit/test_config.py → quantum/tests/unit/nec/test_config.py b/...tum/plugins/nec/tests/unit/test_config.py → quantum/tests/unit/nec/test_config.py
diff --git a/quantum/plugins/nec/tests/unit/test_db.py → quantum/tests/unit/nec/test_db.py b/quantum/plugins/nec/tests/unit/test_db.py → quantum/tests/unit/nec/test_db.py
diff --git a/quantum/tests/unit/test_nec_plugin.py → quantum/tests/unit/nec/test_nec_plugin.py b/quantum/tests/unit/test_nec_plugin.py → quantum/tests/unit/nec/test_nec_plugin.py
diff --git a/...gins/nec/tests/unit/test_nec_plugin_v2.py → quantum/tests/unit/nec/test_nec_plugin_v2.py b/...gins/nec/tests/unit/test_nec_plugin_v2.py → quantum/tests/unit/nec/test_nec_plugin_v2.py
@@ -15,7 +15,6 @@
 #    under the License.
 # @author: Ryota MIBU
 
-import quantum.openstack.common.rpc
 from quantum.plugins.nec.common import config
 from quantum.tests.unit import test_db_plugin
 
@@ -35,25 +34,13 @@ def setUp(self):
 
         plugin = 'quantum.plugins.nec.nec_plugin.NECPluginV2'
         config.CONF.set_override('core_plugin', plugin)
-        driver = "quantum.plugins.nec.tests.unit.stub_ofc_driver.StubOFCDriver"
+        driver = "quantum.tests.unit.nec.stub_ofc_driver.StubOFCDriver"
         config.CONF.set_override('driver', driver, 'OFC')
         config.CONF.set_override('rpc_backend',
                                  'quantum.openstack.common.rpc.impl_fake')
         self.api = test_db_plugin.APIRouter()
         self._skip_native_bulk = False
-
-
-class TestPortsV2(NECPluginTestBase, test_db_plugin.TestPortsV2):
-    pass
-
-
-class TestNetworksV2(NECPluginTestBase, test_db_plugin.TestNetworksV2):
-    pass
-
-
-# NOTE: This plugin does not override methods for subnet.
-#class TestSubnetsV2(NECPluginTestBase, test_db_plugin.TestSubnetsV2):
-#    pass
+        super(NECPluginTestBase, self).setUp(plugin)
 
 
 # TODO(r-mibu): write UT for packet_filters.

diff --git a/...lugins/nec/tests/unit/test_ofc_manager.py → quantum/tests/unit/nec/test_ofc_manager.py b/...lugins/nec/tests/unit/test_ofc_manager.py → quantum/tests/unit/nec/test_ofc_manager.py
@@ -28,7 +28,7 @@ class OFCManagerTest(unittest.TestCase):
     """Class conisting of OFCManager unit tests"""
 
     def setUp(self):
-        driver = "quantum.plugins.nec.tests.unit.stub_ofc_driver.StubOFCDriver"
+        driver = "quantum.tests.unit.nec.stub_ofc_driver.StubOFCDriver"
         config.CONF.set_override('driver', driver, 'OFC')
         ndb.initialize()
         self.ofc = ofc_manager.OFCManager()

diff --git a/...plugins/nec/tests/unit/test_pfc_driver.py → quantum/tests/unit/nec/test_pfc_driver.py b/...plugins/nec/tests/unit/test_pfc_driver.py → quantum/tests/unit/nec/test_pfc_driver.py
diff --git a/...ugins/nec/tests/unit/test_trema_driver.py → quantum/tests/unit/nec/test_trema_driver.py b/...ugins/nec/tests/unit/test_trema_driver.py → quantum/tests/unit/nec/test_trema_driver.py