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

3 files changed, 2 insertions, 24 deletions

diff --git a/selftest/selftesthelpers.py b/selftest/selftesthelpers.py
index cdbe9751f3..40e38aab8b 100644
--- a/selftest/selftesthelpers.py
+++ b/selftest/selftesthelpers.py
@@ -210,21 +210,6 @@ smbtorture4_options = [
     ] + get_env_torture_options()
 
 
-def print_smbtorture4_version():
-    """Print the version of Samba smbtorture4 comes from.
-
-    :return: Whether smbtorture4 was successfully run
-    """
-    try:
-        sub = subprocess.Popen([smbtorture4, "-V"], stdout=sys.stderr)
-    except OSError, e:
-        if e.errno == errno.ENOENT:
-            return False
-        raise
-    sub.communicate("")
-    return (sub.returncode == 0)
-
-
 def plansmbtorture4testsuite(name, env, options, target, modname=None):
     if modname is None:
         modname = "samba4.%s" % name
diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index b8f477a849..19e3066e7b 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")])
diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index b3a7d214e5..6ee625560e 100755
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -40,8 +40,6 @@ else:
 nmblookup4 = binpath('nmblookup4')
 smbclient4 = binpath('smbclient4')
 
-print_smbtorture4_version()
-
 bbdir = os.path.join(srcdir(), "testprogs/blackbox")
 
 # Simple tests for LDAP and CLDAP