[PATCH 02/55] selftest/tests/*.py: remove use of testtools.

Jelmer Vernooij jelmer at samba.org
Fri Feb 6 12:03:34 MST 2015


Change-Id: Ia692c6b3037b7d867310c3793980f9f953d31680
Signed-Off-By: Jelmer Vernooij <jelmer at samba.org>
---
 selftest/tests/__init__.py            | 2 --
 selftest/tests/test_run.py            | 2 +-
 selftest/tests/test_samba.py          | 2 +-
 selftest/tests/test_socket_wrapper.py | 2 +-
 selftest/tests/test_target.py         | 2 +-
 selftest/tests/test_testlist.py       | 2 +-
 6 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/selftest/tests/__init__.py b/selftest/tests/__init__.py
index 85d0316..ee53663 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 de5f4b1..35f99e8 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 b49463e..4528213 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 81fe5b6..5862f1e 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 00b7126..0d081ce 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 7007d6d..c0bbebf 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,
-- 
2.1.4



More information about the samba-technical mailing list