From: Jenkins <jenkins@review.openstack.org>
Date: Wed, 6 Mar 2013 03:15:50 +0000 (+0000)
Subject: Merge "Add common test base class to hold common things."
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=101784e65477fa4624ee1ad6bf9347fd604cc485;p=openstack-build%2Fneutron-build.git

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

101784e65477fa4624ee1ad6bf9347fd604cc485
diff --cc quantum/tests/unit/linuxbridge/test_defaults.py
index 2745a507f,2f06086a1..78332dd4d
--- a/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/nec/test_config.py
index ec3d96bf2,f0347aa90..762ce146d
--- a/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 b69d9dfd6,3e5580e1b..0fee41b73
--- a/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/test_wsgi.py
index 7e66c0a91,3b1999e39..c2759a65f
--- a/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