From 7cb7d4b53eec0bea355a94388bfcce320b36ddfc Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 14 Dec 2014 19:59:13 +0000 Subject: Avoid importing TestCase and TestSkipped from testtools. Change-Id: I34488ddf253decd336a67a8634e7039096bdd160 Signed-off-by: Jelmer Vernooij Reviewed-by: Andrew Bartlett --- python/samba/tests/__init__.py | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) (limited to 'python') diff --git a/python/samba/tests/__init__.py b/python/samba/tests/__init__.py index 5b45865a81..dc6a247cca 100644 --- a/python/samba/tests/__init__.py +++ b/python/samba/tests/__init__.py @@ -26,19 +26,16 @@ from samba.samdb import SamDB from samba import credentials import subprocess import tempfile +import unittest -samba.ensure_external_module("mimeparse", "mimeparse") -samba.ensure_external_module("extras", "extras") -samba.ensure_external_module("testtools", "testtools") +try: + from unittest import SkipTest as TestSkipped +except ImportError: + class TestSkipped(Exception): + """Test skipped.""" -# Other modules import these two classes from here, for convenience: -from testtools.testcase import ( - TestCase as TesttoolsTestCase, - TestSkipped, - ) - -class TestCase(TesttoolsTestCase): +class TestCase(unittest.TestCase): """A Samba test case.""" def setUp(self): @@ -57,7 +54,7 @@ class TestCase(TesttoolsTestCase): return cmdline_credentials -class LdbTestCase(TesttoolsTestCase): +class LdbTestCase(unittest.TestCase): """Trivial test case for running tests against a LDB.""" def setUp(self): -- cgit