From 66762dac8e9a1cf7445fa52c790401d8feadbf4e Mon Sep 17 00:00:00 2001 From: des Date: Fri, 15 Jun 2007 09:26:54 +0000 Subject: [PATCH] \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 --- .../regress/lib/Varnish/Test/Case/Ticket056.pm | 6 +++--- .../regress/lib/Varnish/Test/Case/Ticket102.pm | 6 +++--- .../regress/lib/Varnish/Test/Client.pm | 2 +- .../regress/lib/Varnish/Test/Engine.pm | 10 +++++----- .../regress/lib/Varnish/Test/Server.pm | 2 +- .../regress/lib/Varnish/Test/Varnish.pm | 18 +++++++++--------- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/varnish-tools/regress/lib/Varnish/Test/Case/Ticket056.pm b/varnish-tools/regress/lib/Varnish/Test/Case/Ticket056.pm index 911e8e7c..eb7ddc62 100644 --- 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 2622fc92..eec248b1 100644 --- 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 dd8452cc..8d35aab6 100644 --- 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 d5d08391..b09f4f3b 100644 --- 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 1e1bdcf3..6ff3f6fc 100644 --- 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 b48d2fc2..96ad16af 100644 --- 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'}; -- 2.39.5