X-Git-Url: http://sjero.net/git/?p=wget;a=blobdiff_plain;f=tests%2FTest-N-current.px;h=0ef472892cdd12b0b75b1c7c649f78f06bf948ff;hp=9343d179ad47124bd452725339d8b2ee1d025a2c;hb=d763f8bf6d6e13ce006ffab616cc8a77e747a633;hpb=f0b4f352bfedd1ac5b639db801445261f19a73ff

diff --git a/tests/Test-N-current.px b/tests/Test-N-current.px
index 9343d179..0ef47289 100755
--- a/tests/Test-N-current.px
+++ b/tests/Test-N-current.px
@@ -1,13 +1,14 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 
 use strict;
+use warnings;
 
 use HTTPTest;
 
 
 ###############################################################################
 
-my $wholefile = <<EOF;
+my $currentversion = <<EOF;
 11111111111111111111111111111111111111111111111111
 222222222222222222222222222222222222222222222222222222222222
 3333333333333333333333333333333333333333333333333333333333333333333333
@@ -15,6 +16,11 @@ my $wholefile = <<EOF;
 55555555555555555555555555555555555555555555555555
 EOF
 
+# The server should serve a slightly different content, but with the
+# same length, so we can test which version was downloaded.
+my $modifiedversion = $currentversion;
+$modifiedversion =~ s/^(.{20}).(.*)$/$1x$2/s;
+
 # code, msg, headers, content
 my %urls = (
     '/somefile.txt' => {
@@ -22,24 +28,27 @@ my %urls = (
         msg => "Dontcare",
         headers => {
             "Content-type" => "text/plain",
+            "Last-Modified" => "Sat, 09 Oct 2004 08:30:00 GMT",
         },
-        content => $wholefile,
+        content => $modifiedversion,
     },
 );
 
-my $cmdline = "wget -c http://localhost:8080/somefile.txt";
+my $cmdline = $WgetTest::WGETPATH . " -N http://localhost:{{port}}/somefile.txt";
 
 my $expected_error_code = 0;
 
 my %existing_files = (
     'somefile.txt' => {
-        content => $wholefile,
+        content => $currentversion,
+        timestamp => 1097310600, # "Sat, 09 Oct 2004 08:30:00 GMT"
     },
 );
 
 my %expected_downloaded_files = (
     'somefile.txt' => {
-        content => $wholefile,
+        content => $currentversion,
+        timestamp => 1097310600, # "Sat, 09 Oct 2004 08:30:00 GMT"
     },
 );
 
@@ -51,7 +60,7 @@ my $the_test = HTTPTest->new (name => "Test-N-current",
                               errcode => $expected_error_code, 
                               existing => \%existing_files,
                               output => \%expected_downloaded_files);
-$the_test->run();
+exit $the_test->run();
 
 # vim: et ts=4 sw=4