X-Git-Url: http://sjero.net/git/?p=wget;a=blobdiff_plain;f=tests%2FTest-N-current.px;h=fcf4d886394fbc00e9b315cd6a7f855a23bd0211;hp=bb5b0d922a5bb36dc14b49da917bbc70e5eb9705;hb=HEAD;hpb=829f83bf5bce33e856971b55a8e00c3560da7b4b

diff --git a/tests/Test-N-current.px b/tests/Test-N-current.px
index bb5b0d92..fcf4d886 100755
--- a/tests/Test-N-current.px
+++ b/tests/Test-N-current.px
@@ -1,13 +1,14 @@
-#!/usr/bin/perl -w
+#!/usr/bin/env 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,33 +28,36 @@ 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 = $WgetTest::WGETPATH . " -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"
     },
 );
 
 ###############################################################################
 
 my $the_test = HTTPTest->new (name => "Test-N-current",
-                              input => \%urls, 
-                              cmdline => $cmdline, 
-                              errcode => $expected_error_code, 
+                              input => \%urls,
+                              cmdline => $cmdline,
+                              errcode => $expected_error_code,
                               existing => \%existing_files,
                               output => \%expected_downloaded_files);
 exit $the_test->run();