From 80ec5fb24dceafc021a243572c3d701a7eb7eab7 Mon Sep 17 00:00:00 2001 From: Julien Danjou Date: Thu, 13 Oct 2016 10:44:01 +0200 Subject: [PATCH] Remove testtools dependency We actually don't use it anymore. The skip part can be implemented using unittest. Change-Id: I8b6fc405332062d294ebc5911f22743a0d326486 --- aodh/tests/base.py | 6 +++--- setup.cfg | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/aodh/tests/base.py b/aodh/tests/base.py index 11b3aee7..a11e6576 100644 --- a/aodh/tests/base.py +++ b/aodh/tests/base.py @@ -17,13 +17,13 @@ """ import functools import os.path +import unittest import oslo_messaging.conffixture from oslo_utils import timeutils from oslotest import base from oslotest import mockpatch import six -from testtools import testcase import webtest import aodh @@ -90,10 +90,10 @@ def _skip_decorator(func): try: return func(*args, **kwargs) 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: if 'not implemented' in six.text_type(e): - raise testcase.TestSkipped(six.text_type(e)) + raise unittest.SkipTest(six.text_type(e)) raise return skip_if_not_implemented diff --git a/setup.cfg b/setup.cfg index e4d05c6d..6fc0a2ce 100644 --- a/setup.cfg +++ b/setup.cfg @@ -63,7 +63,6 @@ test = mock>=1.0 tempest>=11.0.0 # Apache-2.0 testrepository>=0.0.18 - testtools>=1.4.0 gabbi>=0.12.0 # Apache-2.0 # Provides subunit-trace os-testr