Merge "Add common test base class to hold common things."

diff --cc quantum/tests/unit/linuxbridge/test_defaults.py
index 2745a507f263ee039cdf0a7afd856e83799d8f05,2f06086a1d57435f6d74130187a0252efdd66a79..78332dd4d2c36fbabf16a958448ac6377c930401
--- 1/quantum/tests/unit/linuxbridge/test_defaults.py
--- 2/quantum/tests/unit/linuxbridge/test_defaults.py
+++ b/quantum/tests/unit/linuxbridge/test_defaults.py
@@@ -17,12 -17,16 +17,12 @@@ from oslo.config import cf
  
  #NOTE this import loads tests required options
  from quantum.plugins.linuxbridge.common import config
+ from quantum.tests import base
  
  
- class ConfigurationTest(testtools.TestCase):
+ class ConfigurationTest(base.BaseTestCase):
  
      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 --cc quantum/tests/unit/midonet/test_midonet_lib.py
Simple merge

diff --cc quantum/tests/unit/nec/test_config.py
index ec3d96bf2f161d54ae2937eb2183da0161f2586b,f0347aa905fef96d9572a581e0e65d9bd1adb7eb..762ce146d6cfae2032224bf43d90eea2e1ec4aa2
--- 1/quantum/tests/unit/nec/test_config.py
--- 2/quantum/tests/unit/nec/test_config.py
+++ b/quantum/tests/unit/nec/test_config.py
@@@ -15,14 -15,15 +15,13 @@@
  #    under the License.
  # @author: Ryota MIBU
  
- import testtools
- 
  from quantum.plugins.nec.common import config
+ from quantum.tests import base
  
  
- class ConfigurationTest(testtools.TestCase):
+ class ConfigurationTest(base.BaseTestCase):
  
      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 --cc quantum/tests/unit/nicira/test_defaults.py
index b69d9dfd66aa2fb8c6c7537edfbe54d6f2d45e27,3e5580e1b73324ec04c934f9b80297c726a26f08..0fee41b73b7e210f0b0ae10ca6e4e8466a956bcb
--- 1/quantum/tests/unit/nicira/test_defaults.py
--- 2/quantum/tests/unit/nicira/test_defaults.py
+++ b/quantum/tests/unit/nicira/test_defaults.py
@@@ -16,13 -16,14 +16,12 @@@
  from oslo.config import cfg
  
  from quantum.plugins.nicira.nicira_nvp_plugin.common import config
+ from quantum.tests import base
  
  
- class ConfigurationTest(testtools.TestCase):
+ class ConfigurationTest(base.BaseTestCase):
  
      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 --cc quantum/tests/unit/openvswitch/test_ovs_defaults.py
Simple merge

diff --cc quantum/tests/unit/test_config.py
Simple merge

diff --cc quantum/tests/unit/test_linux_interface.py
Simple merge

diff --cc quantum/tests/unit/test_linux_ip_lib.py
Simple merge

diff --cc quantum/tests/unit/test_security_groups_rpc.py
Simple merge

diff --cc quantum/tests/unit/test_wsgi.py
index 7e66c0a91a3150820ab8ce5fb2b2acf46858a404,3b1999e39bb7c2fa625ac6f64d3dbdd71b825502..c2759a65f1f660e8c2abb5fbaee9f041418b4787
--- 1/quantum/tests/unit/test_wsgi.py
--- 2/quantum/tests/unit/test_wsgi.py
+++ b/quantum/tests/unit/test_wsgi.py
@@@ -175,29 -174,8 +174,29 @@@ class XMLDeserializerTest(base.BaseTest
          self.assertRaises(
              exception.MalformedRequestBody, deserializer.default, data_string)
  
 +    def test_entity_expansion(self):
 +        def killer_body():
 +            return (("""<!DOCTYPE x [
 +                    <!ENTITY a "%(a)s">
 +                    <!ENTITY b "%(b)s">
 +                    <!ENTITY c "%(c)s">]>
 +                <foo>
 +                    <bar>
 +                        <v1>%(d)s</v1>
 +                    </bar>
 +                </foo>""") % {
 +                'a': 'A' * 10,
 +                'b': '&a;' * 10,
 +                'c': '&b;' * 10,
 +                'd': '&c;' * 9999,
 +            }).strip()
 +
 +        deserializer = wsgi.XMLDeserializer()
 +        self.assertRaises(
 +            ValueError, deserializer.default, killer_body())
 +
  
- class JSONDeserializerTest(testtools.TestCase):
+ class JSONDeserializerTest(base.BaseTestCase):
      def test_default_raise_Maiformed_Exception(self):
          """
          Test verifies JsonDeserializer.default