s4-dns: fixed CNAME automatic DNS updates

[samba.git] / source4 / scripting / bin / subunitrun

diff --git a/source4/scripting/bin/subunitrun b/source4/scripting/bin/subunitrun
index fbbffde42cd5840473c0307a6bbe3d4c6a9f5155..6cd3943786aded20ecdf7864b834ee119cb4bf2b 100755 (executable)
--- a/source4/scripting/bin/subunitrun
+++ b/source4/scripting/bin/subunitrun
@@ -17,12 +17,16 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-from subunit import SubunitTestRunner
 import sys
+
+# Find right directory when running from source tree
+sys.path.insert(0, "bin/python")
+
+from subunit.run import SubunitTestRunner
 from unittest import TestProgram
 import optparse
 import os
-import param
+from samba import param
 import samba.getopt as options
 import samba.tests
 
@@ -38,7 +42,5 @@ args = parser.parse_args()[1]
 samba.tests.cmdline_loadparm = sambaopts.get_loadparm()
 samba.tests.cmdline_credentials = credopts.get_credentials(samba.tests.cmdline_loadparm)
 
-param.cvar.default_config = samba.tests.cmdline_loadparm
-
 runner = SubunitTestRunner()
 program = TestProgram(module=None, argv=[sys.argv[0]] + args, testRunner=runner)