Mercurial > hg > nginx-tests

diff lib/Test/Nginx.pm @ 891:f4189a38c3a4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Tests: mark 'phantom event' alerts on Solaris as TODO (iff any).
author Sergey Kandaurov <pluknet@nginx.com>
date Fri, 01 Apr 2016 20:16:27 +0300
parents f8f8304c8832
children 49579dd88e3f
line wrap: on
line diff
--- a/lib/Test/Nginx.pm
+++ b/lib/Test/Nginx.pm
@@ -66,9 +66,14 @@ sub DESTROY {
 	if (Test::More->builder->expected_tests) {
 		local $Test::Nginx::TODO = 'alerts' unless $self->{_alerts};
 
-		my $alerts = $self->read_file('error.log');
-		$alerts = join "\n", $alerts =~ /.+\[alert\].+/gm;
-		Test::More::is($alerts, '', 'no alerts');
+		my @alerts = $self->read_file('error.log') =~ /.+\[alert\].+/gm;
+
+		if ($^O eq 'solaris') {
+			$Test::Nginx::TODO = 'alerts' if @alerts
+				&& ! grep { $_ !~ /phantom event/ } @alerts;
+		}
+
+		Test::More::is(join("\n", @alerts), '', 'no alerts');
 	}
 
 	if (Test::More->builder->expected_tests) {