test for Etag support in bugreport

diff --git a/Debbugs/CGI.pm b/Debbugs/CGI.pm
index e4681bde6018a839dda3d626a874701b12f2b215..34646b81489e4ae8c4f0e5c2a54dfe55ea7b3a0a 100644 (file)
--- a/Debbugs/CGI.pm
+++ b/Debbugs/CGI.pm
@@ -959,7 +959,7 @@ sub calculate_etags {
                     );
     my @additional_data = @{$param{additional_data}};
     for my $file (@{$param{files}}) {
-       my $st = File::stat($file) or warn "Unable to stat $file:: $!";
+       my $st = stat($file) or warn "Unable to stat $file:: $!";
        push @additional_data,$st->mtime;
        push @additional_data,$st->size;
     }

diff --git a/cgi/bugreport.cgi b/cgi/bugreport.cgi
index 86152f978dc0252b6e36b862f0845246a030c37c..4cdf5a19890ca72e3d96a80e71c45f304135edf7 100755 (executable)
--- a/cgi/bugreport.cgi
+++ b/cgi/bugreport.cgi
@@ -15,11 +15,11 @@ use MIME::Decoder;
 use IO::Scalar;
 use IO::File;
 
-use Debbugs::Config qw(:globals :text);
+use Debbugs::Config qw(:globals :text :config);
 
 # for read_log_records
 use Debbugs::Log qw(:read);
-use Debbugs::CGI qw(:url :html :util);
+use Debbugs::CGI qw(:url :html :util :cache);
 use Debbugs::CGI::Bugreport qw(:all);
 use Debbugs::Common qw(buglog getmaintainers make_list bug_status);
 use Debbugs::Packages qw(getpkgsrc);
@@ -224,7 +224,6 @@ if ( $mbox ) {
                          -cache_control => 'public, max-age=600',
                          -etag => $etag,
                          content_disposition => qq(attachment; filename="bug_${ref}.mbox"),
-                         (length $mtime)?(-last_modified => $mtime):(),
                         );
      }
      else {
@@ -233,7 +232,6 @@ if ( $mbox ) {
                           -cache_control => 'public, max-age=86400',
                           -etag => $etag,
                           content_disposition => qq(attachment; filename="bug_${ref}_message_${msg_num}.mbox"),
-                          (length $mtime)?(-last_modified => $mtime):(),
                          );
      }
      if ($mbox_status_message and @records > 1) {

diff --git a/t/07_bugreport.t b/t/07_bugreport.t
index 78d89b1d0e1c060442b11793eaa831589476e40a..5dfca0507772dd0c916a50dfbbf7224194bd5cd1 100644 (file)
--- a/t/07_bugreport.t
+++ b/t/07_bugreport.t
@@ -1,7 +1,7 @@
 # -*- mode: cperl;-*-
 
 
-use Test::More tests => 16;
+use Test::More tests => 18;
 
 use warnings;
 use strict;
@@ -19,6 +19,7 @@ use Cwd qw(getcwd);
 use Debbugs::MIME qw(create_mime_message);
 use File::Basename qw(dirname basename);
 use Test::WWW::Mechanize;
+use HTTP::Status qw(RC_NOT_MODIFIED);
 # The test functions are placed here to make things easier
 use lib qw(t/lib);
 use DebbugsTest qw(:all);
@@ -58,11 +59,27 @@ EOF
 
 # start up an HTTP::Server::Simple
 my $bugreport_cgi_handler = sub {
-     # I do not understand why this is necessary.
-     $ENV{DEBBUGS_CONFIG_FILE} = "$config{config_dir}/debbugs_config";
-     my $content = qx(perl -I. -T cgi/bugreport.cgi);
-     $content =~ s/^\s*Content-Type:[^\n]+\n*//si;
-     print $content;
+    # I do not understand why this is necessary.
+    $ENV{DEBBUGS_CONFIG_FILE} = "$config{config_dir}/debbugs_config";
+    my $fh;
+    open($fh,'-|',-e './cgi/version.cgi'? 'perl -I. -T ./cgi/bugreport.cgi' : 'perl -I. -T ../cgi/bugreport.cgi');
+    my $headers;
+    my $status = 200;
+    while (<$fh>) {
+        if (/^\s*$/ and $status) {
+            print "HTTP/1.1 $status OK\n";
+            print $headers;
+            $status = 0;
+            print $_;
+        } elsif ($status) {
+            $headers .= $_;
+            if (/^Status:\s*(\d+)/i) {
+                $status = $1;
+            }
+        } else {
+            print $_;
+        }
+    }
 };
 
 my $port = 11342;
@@ -76,6 +93,11 @@ $mech->get_ok('http://localhost:'.$port.'/?bug=1',
              'Page received ok');
 ok($mech->content() =~ qr/\<title\>\#1.+Submitting a bug/i,
    'Title of bug is submitting a bug');
+my $etag = $mech->response->header('Etag');
+$mech->get('http://localhost:'.$port.'/?bug=1',
+          'If-None-Match' => $etag);
+is($mech->res->code, RC_NOT_MODIFIED,
+   'Not modified when the same ETag sent for bug');
 
 $mech->get_ok('http://localhost:'.$port.'/?bug=1;mbox=yes',
               'Page received ok');
@@ -86,9 +108,13 @@ ok($mech->content() =~ qr/^From /m,
 
 $mech->get_ok('http://localhost:'.$port.'/?bug=1;mboxmaint=yes',
               'Page received ok');
-print STDERR $mech->content();
 ok($mech->content() !~ qr/[\x01\x02\x03\x05\x06\x07]/i,
    'No unescaped states');
+$etag = $mech->response->header('Etag');
+$mech->get('http://localhost:'.$port.'/?bug=1;mboxmaint=yes',
+          'If-None-Match' => $etag);
+is($mech->res->code, RC_NOT_MODIFIED,
+   'Not modified when the same ETag sent for bug maintmbox');
 
 # now test the output of some control commands
 my @control_commands =