Delete DATABASE option checkup testcases

Fixes bug #1146441

Change-Id: I2c8dc2bc3e3055e529bdaf38529d804f5e75e036

diff --git a/quantum/tests/unit/linuxbridge/test_defaults.py b/quantum/tests/unit/linuxbridge/test_defaults.py
index d67103c259b2fa4a979f7319d26542e994019e75..2745a507f263ee039cdf0a7afd856e83799d8f05 100644 (file)
--- a/quantum/tests/unit/linuxbridge/test_defaults.py
+++ b/quantum/tests/unit/linuxbridge/test_defaults.py
@@ -23,10 +23,6 @@ from quantum.plugins.linuxbridge.common import config
 class ConfigurationTest(testtools.TestCase):
 
     def test_defaults(self):
-        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',

diff --git a/quantum/tests/unit/nec/test_config.py b/quantum/tests/unit/nec/test_config.py
index 60699dccb88eefe592cb2919b77b29d81d2cfb88..ec3d96bf2f161d54ae2937eb2183da0161f2586b 100644 (file)
--- a/quantum/tests/unit/nec/test_config.py
+++ b/quantum/tests/unit/nec/test_config.py
@@ -23,8 +23,6 @@ from quantum.plugins.nec.common import config
 class ConfigurationTest(testtools.TestCase):
 
     def test_defaults(self):
-        self.assertEqual(-1, config.CONF.DATABASE.sql_max_retries)
-        self.assertEqual(2, config.CONF.DATABASE.reconnect_interval)
         self.assertEqual('br-int', config.CONF.OVS.integration_bridge)
         self.assertEqual(2, config.CONF.AGENT.polling_interval)
         self.assertEqual('sudo', config.CONF.AGENT.root_helper)

diff --git a/quantum/tests/unit/nicira/test_defaults.py b/quantum/tests/unit/nicira/test_defaults.py
index fffb796305932e7a98e4a4232021b29253590de5..b69d9dfd66aa2fb8c6c7537edfbe54d6f2d45e27 100644 (file)
--- a/quantum/tests/unit/nicira/test_defaults.py
+++ b/quantum/tests/unit/nicira/test_defaults.py
@@ -23,8 +23,6 @@ from quantum.plugins.nicira.nicira_nvp_plugin.common import config
 class ConfigurationTest(testtools.TestCase):
 
     def test_defaults(self):
-        self.assertEqual(-1, cfg.CONF.DATABASE.sql_max_retries)
-        self.assertEqual(2, cfg.CONF.DATABASE.reconnect_interval)
         self.assertEqual(64, cfg.CONF.NVP.max_lp_per_bridged_ls)
         self.assertEqual(256, cfg.CONF.NVP.max_lp_per_overlay_ls)
         self.assertEqual(5, cfg.CONF.NVP.concurrent_connections)

diff --git a/quantum/tests/unit/openvswitch/test_ovs_defaults.py b/quantum/tests/unit/openvswitch/test_ovs_defaults.py
index 898a035faafc06695de8e892364f29507a55fa86..cfd5a8f3bcc0561a8e6af23804dc566b503fd950 100644 (file)
--- a/quantum/tests/unit/openvswitch/test_ovs_defaults.py
+++ b/quantum/tests/unit/openvswitch/test_ovs_defaults.py
@@ -27,8 +27,6 @@ class ConfigurationTest(testtools.TestCase):
         self.assertEqual('br-int', cfg.CONF.OVS.integration_bridge)
         self.assertFalse(cfg.CONF.OVS.enable_tunneling)
         self.assertEqual('br-tun', cfg.CONF.OVS.tunnel_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('local', cfg.CONF.OVS.tenant_network_type)