selftest: Remove print_smbtorture4_version and smbtorture4_possible check

smbtorture is now always the same version as the rest of Samba, and is strictly required.

Andrew Bartlett

Change-Id: I89d9c52275477177fa8a89050920ff8a2fec9288
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-By: Jelmer Vernooij <jelmer@samba.org>

Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Wed Mar 26 04:20:16 CET 2014 on sn-devel-104

1 files changed, 2 insertions, 7 deletions

diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index b8f477a8494..19e3066e7b1 100755
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -29,19 +29,14 @@ smbtorture4_options.extend([
    '--option=torture:writetimeupdatedelay=500000',
    ])
 
-smbtorture4_possible = print_smbtorture4_version()
-
 def plansmbtorture4testsuite(name, env, options, description=''):
     if description == '':
         modname = "samba3.%s" % (name, )
     else:
         modname = "samba3.%s %s" % (name, description)
 
-    if smbtorture4_possible:
-        selftesthelpers.plansmbtorture4testsuite(
-            name, env, options, target='samba3', modname=modname)
-    else:
-        skiptestsuite(name, "smbtorture4 is not available")
+    selftesthelpers.plansmbtorture4testsuite(
+        name, env, options, target='samba3', modname=modname)
 
 
 plantestsuite("samba3.blackbox.success", "s3dc:local", [os.path.join(samba3srcdir, "script/tests/test_success.sh")])