[PATCH 09/17] selftest: Drop support for TESTSUITE-IDLIST, and remove its last user.

[Jelmer Vernooij]

Change-Id: Ic616676bb770fa4769195d73c4309915646caae0
Signed-Off-By: Jelmer Vernooij <jelmer at samba.org>
---
 selftest/selftest.pl            | 11 ++++-------
 selftest/selftesthelpers.py     | 17 ++---------------
 selftest/testlist.py            |  3 +--
 selftest/tests/test_testlist.py |  4 ++--
 4 files changed, 9 insertions(+), 26 deletions(-)

diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index 7dde5b2..34ae605 100755
--- 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 d3fcc41..4724e8a 100644
--- a/selftest/selftesthelpers.py
+++ b/selftest/selftesthelpers.py
@@ -144,19 +144,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.
 
@@ -188,10 +175,10 @@ def planpythontestsuite(env, module, name=None, extra_path=[]):
             "%s/lib/subunit/python" % srcdir(),
             "%s/lib/testtools" % srcdir(),
             "%s/lib/extras" % 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 5102f42..50ea31b 100644
--- 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 4474d0a..7846eb1 100644
--- 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())
 
-- 
2.1.1