From afbcaaecba158198cc09325ba119410ff1990acf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20R=C3=BChsen?= Date: Wed, 1 Oct 2014 16:42:04 +0200 Subject: [PATCH] fixed test suite race conditions due to double usage of names --- tests/ChangeLog | 14 ++++++++++++++ tests/Test--post-file.px | 2 +- tests/Test-N-no-info.px | 2 +- tests/Test-N-smaller.px | 2 +- tests/Test-c-shorter.px | 2 +- tests/Test-proxied-https-auth.px | 2 +- tests/Test-proxy-auth-basic.px | 2 +- 7 files changed, 20 insertions(+), 6 deletions(-) diff --git a/tests/ChangeLog b/tests/ChangeLog index f71ef879..0f1e5425 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,17 @@ +2014-10-01 Tim Ruehsen + + * Test--post-file.px: name => "Test--post-file", fixing race + condition. + * Test-N-no-info.px: name => "Test-N-no-info", fixing race + condition. + * Test-N-smaller.px: name => "Test-N-smaller", fixing race + condition. + * Test-c-shorter.px: name => "Test-c-shorter", fixing race + condition. + * Test-proxy-auth-basic.px: name => "Test-proxy-auth-basic", + fixing race condition. + * Test-proxied-https-auth.px: removed debug print line. + 2014-09-25 Tim Ruehsen * Makefile.am: Modified to use parallel test harness diff --git a/tests/Test--post-file.px b/tests/Test--post-file.px index 1212af60..1493858b 100755 --- a/tests/Test--post-file.px +++ b/tests/Test--post-file.px @@ -15,7 +15,7 @@ my $expected_error_code = 3; ############################################################################### -my $the_test = HTTPTest->new (name => "Test-missing-file", +my $the_test = HTTPTest->new (name => "Test--post-file", cmdline => $cmdline, errcode => $expected_error_code); exit $the_test->run(); diff --git a/tests/Test-N-no-info.px b/tests/Test-N-no-info.px index 725be817..bd28400b 100755 --- a/tests/Test-N-no-info.px +++ b/tests/Test-N-no-info.px @@ -52,7 +52,7 @@ my %expected_downloaded_files = ( ############################################################################### -my $the_test = HTTPTest->new (name => "Test-N-current", +my $the_test = HTTPTest->new (name => "Test-N-no-info", input => \%urls, cmdline => $cmdline, errcode => $expected_error_code, diff --git a/tests/Test-N-smaller.px b/tests/Test-N-smaller.px index c89910c2..79c3f013 100755 --- a/tests/Test-N-smaller.px +++ b/tests/Test-N-smaller.px @@ -55,7 +55,7 @@ my %expected_downloaded_files = ( ############################################################################### -my $the_test = HTTPTest->new (name => "Test-N-current", +my $the_test = HTTPTest->new (name => "Test-N-smaller", input => \%urls, cmdline => $cmdline, errcode => $expected_error_code, diff --git a/tests/Test-c-shorter.px b/tests/Test-c-shorter.px index 64b35e13..bbca4d15 100755 --- a/tests/Test-c-shorter.px +++ b/tests/Test-c-shorter.px @@ -53,7 +53,7 @@ my %expected_downloaded_files = ( ############################################################################### -my $the_test = HTTPTest->new (name => "Test-c-partial", +my $the_test = HTTPTest->new (name => "Test-c-shorter", input => \%urls, cmdline => $cmdline, errcode => $expected_error_code, diff --git a/tests/Test-proxied-https-auth.px b/tests/Test-proxied-https-auth.px index 28f147a4..cc987ffb 100755 --- a/tests/Test-proxied-https-auth.px +++ b/tests/Test-proxied-https-auth.px @@ -15,7 +15,7 @@ if (@ARGV) { } elsif (defined $ENV{srcdir}) { $srcdir = $ENV{srcdir}; } -print "srcdir=",$ENV{srcdir},"\n"; + if (defined $srcdir) { $key_path = "$srcdir/certs/server-key.pem"; $cert_path = "$srcdir/certs/server-cert.pem"; diff --git a/tests/Test-proxy-auth-basic.px b/tests/Test-proxy-auth-basic.px index 909d106a..d638976d 100755 --- a/tests/Test-proxy-auth-basic.px +++ b/tests/Test-proxy-auth-basic.px @@ -38,7 +38,7 @@ my %expected_downloaded_files = ( ############################################################################### -my $the_test = HTTPTest->new (name => "Test-auth-basic", +my $the_test = HTTPTest->new (name => "Test-proxy-auth-basic", input => \%urls, cmdline => $cmdline, errcode => $expected_error_code,