Mercurial > hg > nginx-tests
diff mail_error_log.t @ 976:a8b8dd6e8ae1
Tests: changed startup order in mail tests for consistency.
Notably, run_daemon() is postponed until after write_file_expand().
Also added waitforsocket() to avoid startup race.
author | Andrey Zelenkov <zelenkov@nginx.com> |
---|---|
date | Tue, 12 Jul 2016 20:51:06 +0300 |
parents | c227348453db |
children | 196d33c2bb45 |
line wrap: on
line diff
--- a/mail_error_log.t Tue Jul 12 20:18:07 2016 +0300 +++ b/mail_error_log.t Tue Jul 12 20:51:06 2016 +0300 @@ -27,8 +27,7 @@ plan(skip_all => 'win32') if $^O eq 'MSWin32'; -my $t = Test::Nginx->new()->has(qw/mail imap http rewrite/) - ->run_daemon(\&Test::Nginx::IMAP::imap_test_daemon, port(8144)); +my $t = Test::Nginx->new()->has(qw/mail imap http rewrite/); plan(skip_all => 'no error_log') unless $t->has_version('1.9.0'); @@ -90,9 +89,11 @@ open my $stderr, '<', $t->testdir() . '/stderr' or die "Can't open stderr file: $!"; +$t->run_daemon(\&Test::Nginx::IMAP::imap_test_daemon); $t->run_daemon(\&syslog_daemon, port(8081), $t, 's_glob.log'); $t->run_daemon(\&syslog_daemon, port(8082), $t, 's_info.log'); +$t->waitforsocket('127.0.0.1:' . port(8144)); $t->waitforfile($t->testdir . '/s_glob.log'); $t->waitforfile($t->testdir . '/s_info.log');