Convert to oslo.test

bp graduate-oslo-test

Change-Id: Iff1eebac011dab26468a7f1475b5c36b0bb2a7d2
This commit is contained in:
Jeremy Hanmer 2014-02-26 17:05:07 -08:00
parent 7564e2cf47
commit fb453e4f08
6 changed files with 7 additions and 59 deletions

View File

@ -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

View File

@ -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)

View File

@ -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

View File

@ -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)

View File

@ -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}'