diff --git a/openstack_dashboard/test/api_tests/keystone_rest_tests.py b/openstack_dashboard/test/api_tests/keystone_rest_tests.py index ac0a4894f3..e794174a4e 100644 --- a/openstack_dashboard/test/api_tests/keystone_rest_tests.py +++ b/openstack_dashboard/test/api_tests/keystone_rest_tests.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. import mock -import unittest2 +import testtools from django.conf import settings @@ -21,7 +21,7 @@ from openstack_dashboard.api.rest import keystone from rest_test_utils import construct_request # noqa -class KeystoneRestTestCase(unittest2.TestCase): +class KeystoneRestTestCase(testtools.TestCase): def assertStatusCode(self, response, expected_code): if response.status_code == expected_code: return diff --git a/openstack_dashboard/test/api_tests/nova_rest_tests.py b/openstack_dashboard/test/api_tests/nova_rest_tests.py index 4f57be825b..be3deaf3a1 100644 --- a/openstack_dashboard/test/api_tests/nova_rest_tests.py +++ b/openstack_dashboard/test/api_tests/nova_rest_tests.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. import mock -import unittest2 +import testtools from django.conf import settings @@ -21,7 +21,7 @@ from openstack_dashboard.api.rest import nova from rest_test_utils import construct_request # noqa -class NovaRestTestCase(unittest2.TestCase): +class NovaRestTestCase(testtools.TestCase): def assertStatusCode(self, response, expected_code): if response.status_code == expected_code: return diff --git a/openstack_dashboard/test/api_tests/rest_util_tests.py b/openstack_dashboard/test/api_tests/rest_util_tests.py index 8aafbac365..24a89bdac8 100644 --- a/openstack_dashboard/test/api_tests/rest_util_tests.py +++ b/openstack_dashboard/test/api_tests/rest_util_tests.py @@ -12,12 +12,12 @@ # See the License for the specific language governing permissions and # limitations under the License. import mock -import unittest2 +import testtools from openstack_dashboard.api.rest import utils -class RestUtilsTestCase(unittest2.TestCase): +class RestUtilsTestCase(testtools.TestCase): def assertStatusCode(self, response, expected_code): if response.status_code == expected_code: return diff --git a/test-requirements.txt b/test-requirements.txt index 5376f59775..8d3f368c0d 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -23,6 +23,5 @@ oslosphinx>=2.2.0 # Apache-2.0 selenium sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3 testtools>=0.9.36,!=1.2.0 -unittest2 # This also needs xvfb library installed on your OS xvfbwrapper>=0.1.3 #license: MIT