sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

Avoid importing TestCase and TestSkipped from testtools.

Browse Source 
Change-Id: I34488ddf253decd336a67a8634e7039096bdd160
Signed-off-by: Jelmer Vernooij <jelmer@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Jelmer Vernooij 2014-12-14 19:59:13 +00:00 committed by Andrew Bartlett
parent 80e387adfa
commit 7cb7d4b53e
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
python/samba/tests/__init__.py
View File

@ -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")
# Other modules import these two classes from here, for convenience:
from testtools.testcase import (
TestCase as TesttoolsTestCase,
TestSkipped,
)
try:
from unittest import SkipTest as TestSkipped
except ImportError:
class TestSkipped(Exception):
"""Test skipped."""
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):