From: Jenkins <jenkins@review.openstack.org>
Date: Wed, 26 Nov 2014 04:06:13 +0000 (+0000)
Subject: Merge "Fix PYTHONHASHSEED bugs in test_security_groups_rpc"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=963d699df5faa48857f43f1870b68b1a13b5e5f5;p=openstack-build%2Fneutron-build.git

Merge "Fix PYTHONHASHSEED bugs in test_security_groups_rpc"
---

963d699df5faa48857f43f1870b68b1a13b5e5f5
diff --cc neutron/tests/unit/test_security_groups_rpc.py
index 313e14a0b,90e1987b2..24b4a9a3b
--- a/neutron/tests/unit/test_security_groups_rpc.py
+++ b/neutron/tests/unit/test_security_groups_rpc.py
@@@ -242,13 -231,12 +247,13 @@@ class SGServerRpcCallBackTestCase(test_
          plugin_obj = manager.NeutronManager.get_plugin()
          if ('allowed-address-pairs'
              not in plugin_obj.supported_extension_aliases):
-             self.skipTest("Test depeneds on allowed-address-pairs extension")
+             self.skipTest("Test depends on allowed-address-pairs extension")
          fake_prefix = FAKE_PREFIX['IPv4']
          with self.network() as n:
 -            with contextlib.nested(self.subnet(n),
 -                                   self.security_group()) as (subnet_v4,
 -                                                              sg1):
 +            with contextlib.nested(
 +                self.subnet(n),
 +                self.security_group()
 +            ) as (subnet_v4, sg1):
                  sg1_id = sg1['security_group']['id']
                  rule1 = self._build_security_group_rule(
                      sg1_id,