From: Jenkins <jenkins@review.openstack.org>
Date: Sat, 27 Jun 2015 03:43:16 +0000 (+0000)
Subject: Merge "Define SafeFixture base fixture"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=90b4852d33f8eabccf3fc3eaedc11286039613fa;p=openstack-build%2Fneutron-build.git

Merge "Define SafeFixture base fixture"
---

90b4852d33f8eabccf3fc3eaedc11286039613fa
diff --cc neutron/tests/common/net_helpers.py
index cddf86a74,314a41b45..2c5bb94b5
--- a/neutron/tests/common/net_helpers.py
+++ b/neutron/tests/common/net_helpers.py
@@@ -15,9 -15,7 +15,8 @@@
  
  import abc
  
- import fixtures
  import netaddr
 +from oslo_utils import uuidutils
  import six
  
  from neutron.agent.common import ovs_lib
diff --cc neutron/tests/unit/plugins/ml2/test_plugin.py
index 7fed9d586,93bb9601e..abb857b3e
--- a/neutron/tests/unit/plugins/ml2/test_plugin.py
+++ b/neutron/tests/unit/plugins/ml2/test_plugin.py
@@@ -20,9 -20,7 +20,8 @@@ import testtool
  import uuid
  import webob
  
- import fixtures
  from oslo_db import exception as db_exc
 +from oslo_utils import uuidutils
  from sqlalchemy.orm import exc as sqla_exc
  
  from neutron.callbacks import registry