Not all responses have XIDs.

git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@1839 d4fa192b-c00b-0410-8231-f00ffab90ce4

diff --git a/varnish-tools/regress/lib/Varnish/Test/Case.pm b/varnish-tools/regress/lib/Varnish/Test/Case.pm
index e5dfe6512d63d95f8049251e6b329a574162ccc8..2b50fd9253d3004721abb2dcc9bdcf7e4a1e2ffc 100644 (file)
--- a/varnish-tools/regress/lib/Varnish/Test/Case.pm
+++ b/varnish-tools/regress/lib/Varnish/Test/Case.pm
@@ -264,10 +264,6 @@ sub request($$$$;$$) {
        if $ev eq 'ev_client_timeout';
     die "Internal error\n"
        unless $resp && ref($resp) && $resp->isa('HTTP::Response');
-    die "No X-Varnish header\n"
-       unless (!$resp->header('X-Varnish'));
-    die "Invalid X-Varnish header\n"
-       unless ($resp->header('X-Varnish') =~ m/^\d+(?: \d+)?$/);
     $resp->request($req);
     return $self->{'cached_response'} = $resp;
 }
@@ -310,6 +306,18 @@ sub assert_ok($;$) {
     $self->assert_code(200, $resp);
 }
 
+sub assert_xid($;$) {
+    my ($self, $resp) = @_;
+
+    $resp = $self->{'cached_response'}
+        unless defined($resp);
+
+    die "No X-Varnish header\n"
+       unless (!$resp->header('X-Varnish'));
+    die "Invalid X-Varnish header\n"
+       unless ($resp->header('X-Varnish') =~ m/^\d+(?: \d+)?$/);
+}
+
 sub assert_cached($;$) {
     my ($self, $resp) = @_;