From fb453e4f0817a7478ef1df3c3e7fc994016678dc Mon Sep 17 00:00:00 2001
From: Jeremy Hanmer <jeremy@dreamhost.com>
Date: Wed, 26 Feb 2014 17:05:07 -0800
Subject: [PATCH] Convert to oslo.test

bp graduate-oslo-test

Change-Id: Iff1eebac011dab26468a7f1475b5c36b0bb2a7d2
---
 openstack-common.conf                         |  1 -
 .../openstack/common/fixture/__init__.py      |  0
 .../openstack/common/fixture/moxstubout.py    | 32 -------------------
 test-requirements.txt                         |  1 +
 tests/utils.py                                | 28 ++--------------
 tox.ini                                       |  4 ++-
 6 files changed, 7 insertions(+), 59 deletions(-)
 delete mode 100644 oslo/messaging/openstack/common/fixture/__init__.py
 delete mode 100644 oslo/messaging/openstack/common/fixture/moxstubout.py

diff --git a/openstack-common.conf b/openstack-common.conf
index f22613441..1b374887f 100644
--- a/openstack-common.conf
+++ b/openstack-common.conf
@@ -2,7 +2,6 @@
 
 # The list of modules to copy from oslo-incubator.git
 module=excutils
-module=fixture.moxstubout
 module=gettextutils
 module=importutils
 module=jsonutils
diff --git a/oslo/messaging/openstack/common/fixture/__init__.py b/oslo/messaging/openstack/common/fixture/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/oslo/messaging/openstack/common/fixture/moxstubout.py b/oslo/messaging/openstack/common/fixture/moxstubout.py
deleted file mode 100644
index ab4547b4c..000000000
--- a/oslo/messaging/openstack/common/fixture/moxstubout.py
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
-# Copyright 2013 Hewlett-Packard Development Company, L.P.
-# All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-
-import fixtures
-from mox3 import mox
-
-
-class MoxStubout(fixtures.Fixture):
-    """Deal with code around mox and stubout as a fixture."""
-
-    def setUp(self):
-        super(MoxStubout, self).setUp()
-        # emulate some of the mox stuff, we can't use the metaclass
-        # because it screws with our generators
-        self.mox = mox.Mox()
-        self.stubs = self.mox.stubs
-        self.addCleanup(self.mox.UnsetStubs)
-        self.addCleanup(self.mox.VerifyAll)
diff --git a/test-requirements.txt b/test-requirements.txt
index 62bdec8ce..e3fa87b59 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -9,6 +9,7 @@ python-subunit
 testrepository>=0.0.17
 testscenarios>=0.4
 testtools>=0.9.32
+oslotest
 
 # for test_rabbit
 kombu>=2.4.8
diff --git a/tests/utils.py b/tests/utils.py
index 55170ba1e..10cbf8f43 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -21,41 +21,19 @@
 
 """Common utilities used in testing"""
 
-import os
-
-import fixtures
 from oslo.config import cfg
 import six
-import testtools
 
-from oslo.messaging.openstack.common.fixture import moxstubout
+from oslotest import base
+from oslotest import moxstubout
 
 TRUE_VALUES = ('true', '1', 'yes')
 
 
-class BaseTestCase(testtools.TestCase):
+class BaseTestCase(base.BaseTestCase):
 
     def setUp(self, conf=cfg.CONF):
         super(BaseTestCase, self).setUp()
-        self.useFixture(fixtures.FakeLogger('oslo.config'))
-        test_timeout = os.environ.get('OS_TEST_TIMEOUT', 30)
-        try:
-            test_timeout = int(test_timeout)
-        except ValueError:
-            # If timeout value is invalid, fail hard.
-            print("OS_TEST_TIMEOUT set to invalid value"
-                  " defaulting to no timeout")
-            test_timeout = 0
-        if test_timeout > 0:
-            self.useFixture(fixtures.Timeout(test_timeout, gentle=True))
-
-        if os.environ.get('OS_STDOUT_CAPTURE') in TRUE_VALUES:
-            stdout = self.useFixture(fixtures.StringStream('stdout')).stream
-            self.useFixture(fixtures.MonkeyPatch('sys.stdout', stdout))
-        if os.environ.get('OS_STDERR_CAPTURE') in TRUE_VALUES:
-            stderr = self.useFixture(fixtures.StringStream('stderr')).stream
-            self.useFixture(fixtures.MonkeyPatch('sys.stderr', stderr))
-
         self.conf = conf
         self.addCleanup(self.conf.reset)
 
diff --git a/tox.ini b/tox.ini
index 0768c111a..529ba11ba 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,7 +2,9 @@
 envlist = py26,py27,py33,pep8
 
 [testenv]
-setenv = VIRTUAL_ENV={envdir}
+setenv =
+    VIRTUAL_ENV={envdir}
+    OS_TEST_TIMEOUT=30
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
 commands = python setup.py testr --slowest --testr-args='{posargs}'