selftest: Drop support for TESTSUITE-IDLIST, and remove its last user.

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

diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index 7dde5b27364a1e11e6193f478c9bcb355196805b..34ae6056efda87d21247813e64be4c54c64ec224 100755 (executable)
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -568,9 +568,8 @@ sub read_testlist($)
        open(IN, $filename) or die("Unable to open $filename: $!");
 
        while (<IN>) {
-               if (/-- TEST(-LOADLIST|-IDLIST|) --\n/) {
+               if (/-- TEST(-LOADLIST|) --\n/) {
                        my $supports_loadlist = (defined($1) and $1 eq "-LOADLIST");
-                       my $supports_idlist = (defined($1) and $1 eq "-IDLIST");
                        my $name = <IN>;
                        $name =~ s/\n//g;
                        my $env = <IN>;
@@ -578,7 +577,7 @@ sub read_testlist($)
                        my $cmdline = <IN>;
                        $cmdline =~ s/\n//g;
                        if (should_run_test($name) == 1) {
-                               push (@ret, [$name, $env, $cmdline, $supports_loadlist, $supports_idlist]);
+                               push (@ret, [$name, $env, $cmdline, $supports_loadlist]);
                        }
                } else {
                        print;
@@ -823,7 +822,6 @@ sub setup_env($$)
                }
        }
 
-       
        return undef unless defined($testenv_vars);
 
        $running_envs{$envname} = $testenv_vars;
@@ -995,9 +993,8 @@ $envvarstr
                                        print $fh substr($test, length($name)+1) . "\n";
                                }
                                $cmd =~ s/\$LOADLIST/--load-list=$listid_file/g;
-                       } elsif ($$_[4]) {
-                               $cmd =~ s/\s+[^\s]+\s*$//;
-                               $cmd .= " " . join(' ', @{$individual_tests->{$name}});
+                       } else {
+                               warn("Unable to run individual tests in $name, it does not support --loadlist.");
                        }
                }
 

diff --git a/selftest/selftesthelpers.py b/selftest/selftesthelpers.py
index 502ba1079bcbc0685389c65f4c6a264427815d56..984a5cf41b3aee761f505151c430c059bae32173 100644 (file)
--- a/selftest/selftesthelpers.py
+++ b/selftest/selftesthelpers.py
@@ -133,19 +133,6 @@ def plantestsuite_loadlist(name, env, cmdline):
     print "%s $LOADLIST 2>&1 | %s" % (cmdline, add_prefix(name, env, support_list))
 
 
-def plantestsuite_idlist(name, env, cmdline):
-    print "-- TEST-IDLIST --"
-    if env == "none":
-        fullname = name
-    else:
-        fullname = "%s(%s)" % (name, env)
-    print fullname
-    print env
-    if isinstance(cmdline, list):
-        cmdline = " ".join(cmdline)
-    print cmdline
-
-
 def skiptestsuite(name, reason):
     """Indicate that a testsuite was skipped.
 
@@ -178,10 +165,10 @@ def planpythontestsuite(env, module, name=None, extra_path=[]):
             "%s/lib/testtools" % srcdir(),
             "%s/lib/extras" % srcdir(),
             "%s/lib/mimeparse" % srcdir()])
-    args = [python, "-m", "subunit.run", "$LISTOPT", module]
+    args = [python, "-m", "subunit.run", "$LISTOPT", "$LOADLIST", module]
     if pypath:
         args.insert(0, "PYTHONPATH=%s" % ":".join(["$PYTHONPATH"] + pypath))
-    plantestsuite_idlist(name, env, args)
+    plantestsuite_loadlist(name, env, args)
 
 
 def get_env_torture_options():

diff --git a/selftest/testlist.py b/selftest/testlist.py
index 5102f4288bd84a534e60e4af679c4437cc360b7b..50ea31b62db0e8fdd5602e2123cc945fa079c51d 100644 (file)
--- a/selftest/testlist.py
+++ b/selftest/testlist.py
@@ -79,11 +79,10 @@ def read_testlist(inf, outf):
             return
         if l.startswith("-- TEST") and l.endswith(" --\n"):
             supports_loadlist = l.startswith("-- TEST-LOADLIST")
-            supports_idlist = l.startswith("-- TEST-IDLIST")
             name = inf.readline().rstrip("\n")
             env = inf.readline().rstrip("\n")
             cmdline = inf.readline().rstrip("\n")
-            yield (name, env, cmdline, supports_loadlist, supports_idlist)
+            yield (name, env, cmdline, supports_loadlist)
         else:
             outf.write(l)
 

diff --git a/selftest/tests/test_testlist.py b/selftest/tests/test_testlist.py
index 4474d0aa07a097bfee8523ed8dc789f9d181d258..7846eb1eff2f2fb7570e778bf3e1cebcaebf5344 100644 (file)
--- a/selftest/tests/test_testlist.py
+++ b/selftest/tests/test_testlist.py
@@ -67,14 +67,14 @@ class ReadTestlistTests(TestCase):
     def test_read_list(self):
         inf = StringIO("-- TEST --\nfoo\nbar\nbla\n")
         outf = StringIO()
-        self.assertEquals([('foo', 'bar', 'bla', False, False)],
+        self.assertEquals([('foo', 'bar', 'bla', False)],
                 list(read_testlist(inf, outf)))
         self.assertEquals("", outf.getvalue())
 
     def test_read_list_passes_through(self):
         inf = StringIO("MORENOISE\n-- TEST --\nfoo\nbar\nbla\nNOISE\n")
         outf = StringIO()
-        self.assertEquals([('foo', 'bar', 'bla', False, False)],
+        self.assertEquals([('foo', 'bar', 'bla', False)],
                 list(read_testlist(inf, outf)))
         self.assertEquals("MORENOISE\nNOISE\n", outf.getvalue())