\n is not expanded in single-quoted strings.

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

diff --git a/varnish-tools/regress/lib/Varnish/Test/Case/Ticket056.pm b/varnish-tools/regress/lib/Varnish/Test/Case/Ticket056.pm
index 911e8e7c4c1ada4e1e40fa3a3ed8927372748abb..eb7ddc62835bb4526983d5e9b83c89c95be8a253 100644 (file)
--- a/varnish-tools/regress/lib/Varnish/Test/Case/Ticket056.pm
+++ b/varnish-tools/regress/lib/Varnish/Test/Case/Ticket056.pm
@@ -55,11 +55,11 @@ sub testVersionMatch($) {
 
     my ($event, $response) = $self->run_loop('ev_client_response', 'ev_client_timeout');
 
-    die 'Client time-out before receiving a (complete) response\n'
+    die "Client time-out before receiving a (complete) response\n"
        if $event eq 'ev_client_timeout';
-    die 'Server was not contacted by Varnish\n'
+    die "Server was not contacted by Varnish\n"
        if $self->{'engine'}->{'server'}->{'requests'} != $requests + 1;
-    die sprintf('Protocol version mismatch: got: %s expected: %s\n',
+    die sprintf("Protocol version mismatch: got: %s expected: %s\n",
                $response->protocol, $sv)
        if $response->protocol ne $sv;
 

diff --git a/varnish-tools/regress/lib/Varnish/Test/Case/Ticket102.pm b/varnish-tools/regress/lib/Varnish/Test/Case/Ticket102.pm
index 2622fc92c65f3910b12b871b127541a537ad7342..eec248b1a8d6da74833a8f60f448efcd662b83df 100644 (file)
--- a/varnish-tools/regress/lib/Varnish/Test/Case/Ticket102.pm
+++ b/varnish-tools/regress/lib/Varnish/Test/Case/Ticket102.pm
@@ -55,11 +55,11 @@ sub testBodyInCachedPOST($) {
 
        my ($event, $response) = $self->run_loop('ev_client_response', 'ev_client_timeout');
 
-       die 'Client time-out before receiving a (complete) response\n'
+       die "Client time-out before receiving a (complete) response\n"
            if $event eq 'ev_client_timeout';
-       die 'Empty body\n'
+       die "Empty body\n"
            if $response->content eq '';
-       die 'Incorrect body\n'
+       die "Incorrect body\n"
            if $response->content ne $body;
     }
 

diff --git a/varnish-tools/regress/lib/Varnish/Test/Client.pm b/varnish-tools/regress/lib/Varnish/Test/Client.pm
index dd8452cca004aae1298cf1c23ba6bcf954d90131..8d35aab6aac5ba65f5a9c9ea0307ecd1631e1e12 100644 (file)
--- a/varnish-tools/regress/lib/Varnish/Test/Client.pm
+++ b/varnish-tools/regress/lib/Varnish/Test/Client.pm
@@ -119,7 +119,7 @@ sub mux_eof($$$$) {
     my ($self, $mux, $fh, $data) = @_;
 
     if ($$data ne '') {
-       die 'Junk or incomplete response\n'
+       die "Junk or incomplete response\n"
            unless $$data =~ "\n\r?\n";
 
        my $response = HTTP::Response->parse($$data);

diff --git a/varnish-tools/regress/lib/Varnish/Test/Engine.pm b/varnish-tools/regress/lib/Varnish/Test/Engine.pm
index d5d083916cb4bb04e109a2d901cb0e51db883e38..b09f4f3bb82c62e856b80f9df117fc7e201b55ac 100644 (file)
--- a/varnish-tools/regress/lib/Varnish/Test/Engine.pm
+++ b/varnish-tools/regress/lib/Varnish/Test/Engine.pm
@@ -68,11 +68,11 @@ sub log($$$) {
 sub run_loop($@) {
     my ($self, @wait_for) = @_;
 
-    die 'Engine::run_loop: Already inside select-loop. Your code is buggy.\n'
-      if exists($self->{'in_loop'});
+    die "Engine::run_loop: Already inside select-loop. Your code is buggy.\n"
+       if exists($self->{'in_loop'});
 
-    die 'Engine::run_loop: No events to wait for.\n'
-      if @wait_for == 0;
+    die "Engine::run_loop: No events to wait for.\n"
+       if @wait_for == 0;
 
     while (@{$self->{'pending'}} > 0) {
        my ($event, @args) = @{shift @{$self->{'pending'}}};
@@ -106,7 +106,7 @@ sub AUTOLOAD ($;@) {
 
     return if $event eq 'DESTROY';
 
-    die sprintf('Unknown method "%s"\n', $event)
+    die sprintf("Unknown method '%s'\n", $event)
        unless $event =~ /^ev_(.*)$/;
 
     $self->log($self, 'ENG: ', sprintf('EVENT "%s"', $1));

diff --git a/varnish-tools/regress/lib/Varnish/Test/Server.pm b/varnish-tools/regress/lib/Varnish/Test/Server.pm
index 1e1bdcf3029fd3c8d7d2645635538d09471b5226..6ff3f6fcf411dcd220dce395657974e36187f4f6 100644 (file)
--- a/varnish-tools/regress/lib/Varnish/Test/Server.pm
+++ b/varnish-tools/regress/lib/Varnish/Test/Server.pm
@@ -158,7 +158,7 @@ sub mux_input($$$$) {
 sub mux_eof($$$$) {
     my ($self, $mux, $fh, $data) = @_;
 
-    die 'Junk or incomplete request\n'
+    die "Junk or incomplete request\n"
        unless $$data eq '';
 }
 

diff --git a/varnish-tools/regress/lib/Varnish/Test/Varnish.pm b/varnish-tools/regress/lib/Varnish/Test/Varnish.pm
index b48d2fc27a3b620642b8120f49b8808961f9d158..96ad16af7ee5514a6ffaaad3b2e0a4922724afd6 100644 (file)
--- a/varnish-tools/regress/lib/Varnish/Test/Varnish.pm
+++ b/varnish-tools/regress/lib/Varnish/Test/Varnish.pm
@@ -125,9 +125,9 @@ sub backend_block($$) {
 
 sub send_command($@) {
     my ($self, @args) = @_;
-    die 'not ready\n'
+    die "not ready\n"
        if $self->{'state'} eq 'init';
-    die sprintf('busy awaiting earlier command (%s)\n', $self->{'pending'})
+    die sprintf("busy awaiting earlier command (%s)\n", $self->{'pending'})
        if defined $self->{'pending'};
 
     foreach (@args) {
@@ -156,19 +156,19 @@ sub use_vcl($$) {
 
 sub start_child($) {
     my ($self) = @_;
-    die 'not ready\n'
-       if $self->{'state'} eq 'init';
-    die 'already started\n'
-       if $self->{'state'} eq 'started';
+    die "not ready\n"
+       if $self->{'state'} eq "init";
+    die "already started\n"
+       if $self->{'state'} eq "started";
 
     $self->send_command("start");
 }
 
 sub stop_child($) {
     my ($self) = @_;
-    die 'not ready\n'
+    die "not ready\n"
        if $self->{'state'} eq 'init';
-    die 'already stopped\n'
+    die "already stopped\n"
        if $self->{'state'} eq 'stopped';
 
     $self->send_command("stop");
@@ -184,7 +184,7 @@ sub kill($;$) {
     my ($self, $signal) = @_;
 
     $signal ||= 15;
-    die 'Not running\n'
+    die "Not running\n"
        unless defined($self->{'pid'});
     kill($signal, $self->{'pid'});
     delete $self->{'pid'};