Resolves ryu plugin unittest errors

Removed obsolete DATABASE value tests in ryu/test_defaults.py
Added fake_ryu client in test_ryu_security_group.py
Imported quantum.plugins.ryu.db.models_v2 in test_ryu_plugin.py

Fixes bug #1151642

Change-Id: I60e5aee90da9fa32bd285e6f6bbd95cd7ee1ce2c

diff --git a/quantum/tests/unit/ryu/test_defaults.py b/quantum/tests/unit/ryu/test_defaults.py
index 91442650c364b5f7d42c2fe7e5e5ce565e4166af..8356d07d00a533f793c529f2fdbc97136b4ba190 100644 (file)
--- a/quantum/tests/unit/ryu/test_defaults.py
+++ b/quantum/tests/unit/ryu/test_defaults.py
@@ -26,8 +26,6 @@ class ConfigurationTest(base.BaseTestCase):
     """Configuration file Tests"""
     def test_defaults(self):
         self.assertEqual('br-int', cfg.CONF.OVS.integration_bridge)
-        self.assertEqual(-1, cfg.CONF.DATABASE.sql_max_retries)
-        self.assertEqual(2, cfg.CONF.DATABASE.reconnect_interval)
         self.assertEqual(2, cfg.CONF.AGENT.polling_interval)
         self.assertEqual('sudo', cfg.CONF.AGENT.root_helper)
         self.assertEqual('127.0.0.1:8080', cfg.CONF.OVS.openflow_rest_api)

diff --git a/quantum/tests/unit/ryu/test_ryu_db.py b/quantum/tests/unit/ryu/test_ryu_db.py
index 234e44cdc08efd3a86606a5a509de2f7a12a2f2c..099e4c6908ba7df1b8920fac66ca7b275387ba63 100644 (file)
--- a/quantum/tests/unit/ryu/test_ryu_db.py
+++ b/quantum/tests/unit/ryu/test_ryu_db.py
@@ -24,6 +24,7 @@ from quantum.db import api as db
 # NOTE: this import is needed for correct plugin code work
 from quantum.plugins.ryu.common import config
 from quantum.plugins.ryu.db import api_v2 as db_api_v2
+# NOTE: this import is needed for correct plugin code work
 from quantum.plugins.ryu.db import models_v2 as ryu_models_v2
 from quantum.tests.unit import test_db_plugin as test_plugin
 

diff --git a/quantum/tests/unit/ryu/test_ryu_plugin.py b/quantum/tests/unit/ryu/test_ryu_plugin.py
index 47f1ba35786fe361c8d8163f43e97054aacb980a..e01568009fbee609a4fea28953226e7c1214d8d9 100644 (file)
--- a/quantum/tests/unit/ryu/test_ryu_plugin.py
+++ b/quantum/tests/unit/ryu/test_ryu_plugin.py
@@ -15,6 +15,8 @@
 
 import mock
 
+# NOTE: this import is needed for correct plugin code work
+from quantum.plugins.ryu.db import models_v2 as ryu_models_v2
 from quantum.tests.unit.ryu import fake_ryu
 from quantum.tests.unit import test_db_plugin as test_plugin
 

diff --git a/quantum/tests/unit/ryu/test_ryu_security_group.py b/quantum/tests/unit/ryu/test_ryu_security_group.py
index 4a1a9571bc293aa80a7aa2d284c05f657d8621e7..622c9ceeb23e131f719d6bc47c3e71b9e71fcff2 100644 (file)
--- a/quantum/tests/unit/ryu/test_ryu_security_group.py
+++ b/quantum/tests/unit/ryu/test_ryu_security_group.py
@@ -23,6 +23,7 @@ from quantum.api.v2 import attributes
 from quantum.extensions import securitygroup as ext_sg
 from quantum import manager
 from quantum.plugins.ryu.db import api_v2 as api_db_v2
+from quantum.tests.unit.ryu import fake_ryu
 from quantum.tests.unit import test_extension_security_group as test_sg
 from quantum.tests.unit import test_security_groups_rpc as test_sg_rpc
 
@@ -40,6 +41,7 @@ class RyuSecurityGroupsTestCase(test_sg.SecurityGroupDBTestCase):
     def setUp(self, plugin=None):
         test_sg_rpc.set_firewall_driver(test_sg_rpc.FIREWALL_HYBRID_DRIVER)
         self.addCleanup(mock.patch.stopall)
+        self.fake_ryu = fake_ryu.patch_fake_ryu_client().start()
         notifier_p = mock.patch(NOTIFIER)
         notifier_cls = notifier_p.start()
         self.notifier = mock.Mock()