From fa0ac3f4d9ca095c33bca62ba2f64c95e3c3456a Mon Sep 17 00:00:00 2001 From: Dan Fandrich Date: Sat, 13 May 2017 19:04:10 +0200 Subject: [PATCH] tests: made a couple of prechecks consistent with others Also removed a TODO suggesting caching the precheck results. Tests showed this would save about 0.1 sec on the total test run time on a relatively modern system, an unnoticeable gain at the cost of longer and more complicated code. There would also be a danger that a cached test result would be inappropriately returned, such as when other test dependencies (like environment variables) are different or when the precheck causes side effects (like filesystem changes). --- tests/data/test1105 | 2 +- tests/data/test31 | 2 +- tests/runtests.pl | 5 ----- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/tests/data/test1105 b/tests/data/test1105 index 76ac4500a..4b5e0c836 100644 --- a/tests/data/test1105 +++ b/tests/data/test1105 @@ -35,7 +35,7 @@ HTTP with cookie parser and header recording "http://%HOSTIP:%HTTPPORT/we/want/1105?parm1=this*that/other/thing&parm2=foobar/1105" -c log/cookie1105.txt -d "userid=myname&password=mypassword" -perl -e 'if ("%HOSTIP" !~ /127\.0\.0\.1$/) {print "Test only works for HOSTIP 127.0.0.1"; exit(1)}' +perl -e "print 'Test requires default test server host' if ( '%HOSTIP' ne '127.0.0.1' );" diff --git a/tests/data/test31 b/tests/data/test31 index 2289d56d7..54e360a46 100644 --- a/tests/data/test31 +++ b/tests/data/test31 @@ -80,7 +80,7 @@ TZ=GMT http://%HOSTIP:%HTTPPORT/we/want/31 -b none -c log/jar31.txt -perl -e 'if ("%HOSTIP" !~ /127\.0\.0\.1$/) {print "Test only works for HOSTIP 127.0.0.1"; exit(1)}' +perl -e "print 'Test requires default test server host' if ( '%HOSTIP' ne '127.0.0.1' );" diff --git a/tests/runtests.pl b/tests/runtests.pl index d20383ae8..f23fc1d68 100755 --- a/tests/runtests.pl +++ b/tests/runtests.pl @@ -3279,11 +3279,6 @@ sub singletest { } if(!$why) { - # TODO: - # Add a precheck cache. If a precheck command was already invoked - # exactly like this, then use the previous result to speed up - # successive test invokes! - my @precheck = getpart("client", "precheck"); if(@precheck) { $cmd = $precheck[0];