[PATCH 48/55] Use samba TestCase so we get all compatibility functions on Python < 2.7.

Jelmer Vernooij jelmer at samba.org
Fri Feb 6 12:04:20 MST 2015


Change-Id: Iba87e3c8fa9331c4d5438ab60a8385379da634d7
Signed-Off-By: Jelmer Vernooij <jelmer at samba.org>
---
 python/samba/tests/__init__.py        | 2 +-
 selftest/tests/test_samba.py          | 2 +-
 selftest/tests/test_socket_wrapper.py | 2 +-
 selftest/tests/test_target.py         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/python/samba/tests/__init__.py b/python/samba/tests/__init__.py
index 480b2c8..b73308e 100644
--- a/python/samba/tests/__init__.py
+++ b/python/samba/tests/__init__.py
@@ -81,7 +81,7 @@ class TestCase(unittest.TestCase):
                 fn(*args, **kwargs)
 
 
-class LdbTestCase(unittest.TestCase):
+class LdbTestCase(TestCase):
     """Trivial test case for running tests against a LDB."""
 
     def setUp(self):
diff --git a/selftest/tests/test_samba.py b/selftest/tests/test_samba.py
index 4528213..23de0d3 100644
--- a/selftest/tests/test_samba.py
+++ b/selftest/tests/test_samba.py
@@ -21,7 +21,7 @@
 
 from cStringIO import StringIO
 
-from unittest import TestCase
+from samba.tests 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 5862f1e..e278fdd 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 unittest import TestCase
+from samba.tests import TestCase
 
 from selftest import socket_wrapper
 
diff --git a/selftest/tests/test_target.py b/selftest/tests/test_target.py
index 0d081ce..ed9b064 100644
--- a/selftest/tests/test_target.py
+++ b/selftest/tests/test_target.py
@@ -29,7 +29,7 @@ from selftest.target import (
     UnsupportedEnvironment,
     )
 
-from unittest import TestCase
+from samba.tests import TestCase
 
 
 class DummyEnvironment(Environment):
-- 
2.1.4



More information about the samba-technical mailing list