Merge "Define SafeFixture base fixture"

diff --cc neutron/tests/base.py
Simple merge

diff --cc neutron/tests/common/net_helpers.py
index cddf86a748c3e9f77a306ece10403d839bd6dff6,314a41b457ae801b669227a688e7610409c1d4b6..2c5bb94b5a0847e69b87303edaecd01184fe290e
--- 1/neutron/tests/common/net_helpers.py
--- 2/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 7fed9d586e42450a53d5812ed475e3b11a9e0946,93bb9601efd74c9dbd8d369e1a9d06bc9ce8e4eb..abb857b3e3a420c44cd791b211691cfcf756467f
--- 1/neutron/tests/unit/plugins/ml2/test_plugin.py
--- 2/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