summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2014-12-11 01:11:41 +0000
committerAndrew Bartlett <abartlet@samba.org>2015-03-06 04:41:46 +0100
commit3f1ecfd2d04b919cd488692ff4bcf02dcac60205 (patch)
treeebbd590156e7aff2f441bfda558783a8893570e5
parentdaf63fef10835a5c5a7b51a78fbd45911a48e58e (diff)
downloadsamba-3f1ecfd2d04b919cd488692ff4bcf02dcac60205.tar.gz
samba-3f1ecfd2d04b919cd488692ff4bcf02dcac60205.tar.xz
samba-3f1ecfd2d04b919cd488692ff4bcf02dcac60205.zip
selftest/tests/*.py: remove use of testtools.
Change-Id: Ia692c6b3037b7d867310c3793980f9f953d31680 Signed-Off-By: Jelmer Vernooij <jelmer@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
-rw-r--r--selftest/tests/__init__.py2
-rw-r--r--selftest/tests/test_run.py2
-rw-r--r--selftest/tests/test_samba.py2
-rw-r--r--selftest/tests/test_socket_wrapper.py2
-rw-r--r--selftest/tests/test_target.py2
-rw-r--r--selftest/tests/test_testlist.py2
6 files changed, 5 insertions, 7 deletions
diff --git a/selftest/tests/__init__.py b/selftest/tests/__init__.py
index 85d0316b46..ee536630ce 100644
--- a/selftest/tests/__init__.py
+++ b/selftest/tests/__init__.py
@@ -19,8 +19,6 @@
"""Tests for selftest."""
-from testtools import TestCase
-
import unittest
def test_suite():
diff --git a/selftest/tests/test_run.py b/selftest/tests/test_run.py
index de5f4b121b..35f99e83c7 100644
--- a/selftest/tests/test_run.py
+++ b/selftest/tests/test_run.py
@@ -33,7 +33,7 @@ from selftest.run import (
run_testsuite_command,
)
-from selftest.tests import TestCase
+from unittest import TestCase
class ExpandEnvironmentStringsTests(TestCase):
diff --git a/selftest/tests/test_samba.py b/selftest/tests/test_samba.py
index b49463eabb..4528213c4e 100644
--- a/selftest/tests/test_samba.py
+++ b/selftest/tests/test_samba.py
@@ -21,7 +21,7 @@
from cStringIO import StringIO
-from selftest.tests import TestCase
+from unittest import TestCase
from selftest.target.samba import (
bindir_path,
diff --git a/selftest/tests/test_socket_wrapper.py b/selftest/tests/test_socket_wrapper.py
index 81fe5b603c..5862f1edf8 100644
--- a/selftest/tests/test_socket_wrapper.py
+++ b/selftest/tests/test_socket_wrapper.py
@@ -19,7 +19,7 @@
"""Tests for selftest/socket_wrapper."""
-from selftest.tests import TestCase
+from unittest import TestCase
from selftest import socket_wrapper
diff --git a/selftest/tests/test_target.py b/selftest/tests/test_target.py
index 00b7126a07..0d081ceadb 100644
--- a/selftest/tests/test_target.py
+++ b/selftest/tests/test_target.py
@@ -29,7 +29,7 @@ from selftest.target import (
UnsupportedEnvironment,
)
-from selftest.tests import TestCase
+from unittest import TestCase
class DummyEnvironment(Environment):
diff --git a/selftest/tests/test_testlist.py b/selftest/tests/test_testlist.py
index 7007d6d35a..c0bbebfc14 100644
--- a/selftest/tests/test_testlist.py
+++ b/selftest/tests/test_testlist.py
@@ -22,7 +22,7 @@
import os
import tempfile
-from selftest.tests import TestCase
+from unittest import TestCase
from selftest.testlist import (
RestrictedTestManager,