Merge "Parallelize quantum unit testing:"

diff --cc quantum/tests/unit/cisco/test_nexus_plugin.py
Simple merge

diff --cc quantum/tests/unit/openvswitch/test_ovs_tunnel.py
Simple merge

diff --cc quantum/tests/unit/test_l3_plugin.py
index 819c9418b9ef7907ca26a47c88fe79cdbd2a2480,497ac9c3475aa5b3bb853b7de43ec1bd85deb0f8..4c7f66e069a2c97f812fe38af5391dfbf350a2bd
--- 1/quantum/tests/unit/test_l3_plugin.py
--- 2/quantum/tests/unit/test_l3_plugin.py
+++ b/quantum/tests/unit/test_l3_plugin.py
@@@ -664,21 -667,9 +665,21 @@@ class L3NatDBTestCase(L3NatTestCaseBase
                                    expected_code=exc.HTTPNotFound.code)
  
                  self.assertEqual(
-                     set(n['event_type'] for n in test_notifier.NOTIFICATIONS),
-                     set(exp_notifications))
+                     set(exp_notifications),
+                     set(n['event_type'] for n in test_notifier.NOTIFICATIONS))
  
 +                for n in test_notifier.NOTIFICATIONS:
 +                    if n['event_type'].startswith('router.interface.'):
 +                        payload = n['payload']['router.interface']
 +                        self.assertIn('id', payload)
 +                        self.assertEquals(payload['id'], r['router']['id'])
 +                        self.assertIn('tenant_id', payload)
 +                        stid = s['subnet']['tenant_id']
 +                        # tolerate subnet tenant deliberately to '' in the
 +                        # nicira metadata access case
 +                        self.assertTrue(payload['tenant_id'] == stid or
 +                                        payload['tenant_id'] == '')
 +
      def test_router_add_interface_subnet_with_bad_tenant_returns_404(self):
          with mock.patch('quantum.context.Context.to_dict') as tdict:
              tenant_id = _uuid()

diff --cc tox.ini
Simple merge