sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-31 17:18:04 +03:00
Code

subunitrun: Remove global subunit module when reimporting from a

Browse Source 
different location.
This commit is contained in:
Jelmer Vernooij 2010-12-09 22:48:16 +01:00
parent 8f4c064b49
commit b1daa50293
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source4/scripting/bin/subunitrun
View File

@ -26,7 +26,12 @@ import optparse
import samba
samba.ensure_external_module("testtools", "testtools")
samba.ensure_external_module("subunit", "subunit/python")
from subunit.run import SubunitTestRunner, TestProgram
try:
from subunit.run import SubunitTestRunner, TestProgram
except ImportError:
del sys.modules["subunit"]
samba.import_bundled_package("subunit", "subunit/python")
from subunit.run import SubunitTestRunner, TestProgram
import samba.getopt as options
import samba.tests