r1523 - in trunk/varnish-tools/regress/lib/Varnish/Test: . Case

[des at projects.linpro.no]

Author: des
Date: 2007-06-15 11:26:54 +0200 (Fri, 15 Jun 2007)
New Revision: 1523

Modified:
   trunk/varnish-tools/regress/lib/Varnish/Test/Case/Ticket056.pm
   trunk/varnish-tools/regress/lib/Varnish/Test/Case/Ticket102.pm
   trunk/varnish-tools/regress/lib/Varnish/Test/Client.pm
   trunk/varnish-tools/regress/lib/Varnish/Test/Engine.pm
   trunk/varnish-tools/regress/lib/Varnish/Test/Server.pm
   trunk/varnish-tools/regress/lib/Varnish/Test/Varnish.pm
Log:
\n is not expanded in single-quoted strings.


Modified: trunk/varnish-tools/regress/lib/Varnish/Test/Case/Ticket056.pm
===================================================================
--- trunk/varnish-tools/regress/lib/Varnish/Test/Case/Ticket056.pm	2007-06-15 09:23:25 UTC (rev 1522)
+++ trunk/varnish-tools/regress/lib/Varnish/Test/Case/Ticket056.pm	2007-06-15 09:26:54 UTC (rev 1523)
@@ -55,11 +55,11 @@
 
     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;
 

Modified: trunk/varnish-tools/regress/lib/Varnish/Test/Case/Ticket102.pm
===================================================================
--- trunk/varnish-tools/regress/lib/Varnish/Test/Case/Ticket102.pm	2007-06-15 09:23:25 UTC (rev 1522)
+++ trunk/varnish-tools/regress/lib/Varnish/Test/Case/Ticket102.pm	2007-06-15 09:26:54 UTC (rev 1523)
@@ -55,11 +55,11 @@
 
 	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;
     }
 

Modified: trunk/varnish-tools/regress/lib/Varnish/Test/Client.pm
===================================================================
--- trunk/varnish-tools/regress/lib/Varnish/Test/Client.pm	2007-06-15 09:23:25 UTC (rev 1522)
+++ trunk/varnish-tools/regress/lib/Varnish/Test/Client.pm	2007-06-15 09:26:54 UTC (rev 1523)
@@ -119,7 +119,7 @@
     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);

Modified: trunk/varnish-tools/regress/lib/Varnish/Test/Engine.pm
===================================================================
--- trunk/varnish-tools/regress/lib/Varnish/Test/Engine.pm	2007-06-15 09:23:25 UTC (rev 1522)
+++ trunk/varnish-tools/regress/lib/Varnish/Test/Engine.pm	2007-06-15 09:26:54 UTC (rev 1523)
@@ -68,11 +68,11 @@
 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 @@
 
     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));

Modified: trunk/varnish-tools/regress/lib/Varnish/Test/Server.pm
===================================================================
--- trunk/varnish-tools/regress/lib/Varnish/Test/Server.pm	2007-06-15 09:23:25 UTC (rev 1522)
+++ trunk/varnish-tools/regress/lib/Varnish/Test/Server.pm	2007-06-15 09:26:54 UTC (rev 1523)
@@ -158,7 +158,7 @@
 sub mux_eof($$$$) {
     my ($self, $mux, $fh, $data) = @_;
 
-    die 'Junk or incomplete request\n'
+    die "Junk or incomplete request\n"
 	unless $$data eq '';
 }
 

Modified: trunk/varnish-tools/regress/lib/Varnish/Test/Varnish.pm
===================================================================
--- trunk/varnish-tools/regress/lib/Varnish/Test/Varnish.pm	2007-06-15 09:23:25 UTC (rev 1522)
+++ trunk/varnish-tools/regress/lib/Varnish/Test/Varnish.pm	2007-06-15 09:26:54 UTC (rev 1523)
@@ -125,9 +125,9 @@
 
 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 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 @@
     my ($self, $signal) = @_;
 
     $signal ||= 15;
-    die 'Not running\n'
+    die "Not running\n"
 	unless defined($self->{'pid'});
     kill($signal, $self->{'pid'});
     delete $self->{'pid'};