Remove testtools dependency

We actually don't use it anymore. The skip part can be implemented using
unittest.

Change-Id: I8b6fc405332062d294ebc5911f22743a0d326486
This commit is contained in:
Julien Danjou 2016-10-13 10:44:01 +02:00
parent 4570e42803
commit 80ec5fb24d
2 changed files with 3 additions and 4 deletions

View File

@ -17,13 +17,13 @@
""" """
import functools import functools
import os.path import os.path
import unittest
import oslo_messaging.conffixture import oslo_messaging.conffixture
from oslo_utils import timeutils from oslo_utils import timeutils
from oslotest import base from oslotest import base
from oslotest import mockpatch from oslotest import mockpatch
import six import six
from testtools import testcase
import webtest import webtest
import aodh import aodh
@ -90,10 +90,10 @@ def _skip_decorator(func):
try: try:
return func(*args, **kwargs) return func(*args, **kwargs)
except aodh.NotImplementedError as e: except aodh.NotImplementedError as e:
raise testcase.TestSkipped(six.text_type(e)) raise unittest.SkipTest(six.text_type(e))
except webtest.app.AppError as e: except webtest.app.AppError as e:
if 'not implemented' in six.text_type(e): if 'not implemented' in six.text_type(e):
raise testcase.TestSkipped(six.text_type(e)) raise unittest.SkipTest(six.text_type(e))
raise raise
return skip_if_not_implemented return skip_if_not_implemented

View File

@ -63,7 +63,6 @@ test =
mock>=1.0 mock>=1.0
tempest>=11.0.0 # Apache-2.0 tempest>=11.0.0 # Apache-2.0
testrepository>=0.0.18 testrepository>=0.0.18
testtools>=1.4.0
gabbi>=0.12.0 # Apache-2.0 gabbi>=0.12.0 # Apache-2.0
# Provides subunit-trace # Provides subunit-trace
os-testr os-testr