# HG changeset patch # User Sergey Kandaurov # Date 1511189722 -10800 # Node ID 575d39cc0e353ac247a0aebd0b18abe8ee9c0f1a # Parent 6ea73d9f42e0c7662a45a808802531b030e73249 Tests: worker_shutdown_timeout within the mail module. diff --git a/lib/Test/Nginx/IMAP.pm b/lib/Test/Nginx/IMAP.pm --- a/lib/Test/Nginx/IMAP.pm +++ b/lib/Test/Nginx/IMAP.pm @@ -10,6 +10,7 @@ use warnings; use strict; use Test::More qw//; +use IO::Select; use IO::Socket; use Socket qw/ CRLF /; @@ -86,6 +87,11 @@ sub ok { Test::More->builder->like($self->read(), qr/^\S+ OK/, @_); } +sub can_read { + my ($self, $timo) = @_; + IO::Select->new($self->{_socket})->can_read($timo || 3); +} + ############################################################################### sub imap_test_daemon { diff --git a/lib/Test/Nginx/POP3.pm b/lib/Test/Nginx/POP3.pm --- a/lib/Test/Nginx/POP3.pm +++ b/lib/Test/Nginx/POP3.pm @@ -10,6 +10,7 @@ use warnings; use strict; use Test::More qw//; +use IO::Select; use IO::Socket; use Socket qw/ CRLF /; @@ -86,6 +87,11 @@ sub ok { Test::More->builder->like($self->read(), qr/^\+OK/, @_); } +sub can_read { + my ($self, $timo) = @_; + IO::Select->new($self->{_socket})->can_read($timo || 3); +} + ############################################################################### sub pop3_test_daemon { diff --git a/lib/Test/Nginx/SMTP.pm b/lib/Test/Nginx/SMTP.pm --- a/lib/Test/Nginx/SMTP.pm +++ b/lib/Test/Nginx/SMTP.pm @@ -10,6 +10,7 @@ use warnings; use strict; use Test::More qw//; +use IO::Select; use IO::Socket; use Socket qw/ CRLF /; @@ -90,6 +91,11 @@ sub authok { Test::More->builder->like($self->read(), qr/^235 /, @_); } +sub can_read { + my ($self, $timo) = @_; + IO::Select->new($self->{_socket})->can_read($timo || 3); +} + ############################################################################### sub smtp_test_daemon { diff --git a/worker_shutdown_timeout_mail.t b/worker_shutdown_timeout_mail.t new file mode 100644 --- /dev/null +++ b/worker_shutdown_timeout_mail.t @@ -0,0 +1,96 @@ +#!/usr/bin/perl + +# (C) Sergey Kandaurov +# (C) Nginx, Inc. + +# Tests for worker_shutdown_timeout directive within the mail module. + +############################################################################### + +use warnings; +use strict; + +use Test::More; + +use MIME::Base64; + +BEGIN { use FindBin; chdir($FindBin::Bin); } + +use lib 'lib'; +use Test::Nginx; +use Test::Nginx::SMTP; + +############################################################################### + +select STDERR; $| = 1; +select STDOUT; $| = 1; + +local $SIG{PIPE} = 'IGNORE'; + +my $t = Test::Nginx->new()->has(qw/mail imap http rewrite/)->plan(4) + ->write_file_expand('nginx.conf', <<'EOF'); + +%%TEST_GLOBALS%% + +daemon off; +worker_shutdown_timeout 10ms; + +events { +} + +mail { + proxy_pass_error_message on; + auth_http http://127.0.0.1:8080/mail/auth; + xclient off; + + server { + listen 127.0.0.1:8025; + protocol smtp; + } +} + +http { + %%TEST_GLOBALS_HTTP%% + + server { + listen 127.0.0.1:8080; + server_name localhost; + + location = /mail/auth { + add_header Auth-Status OK; + add_header Auth-Server 127.0.0.1; + add_header Auth-Port %%PORT_8026%%; + add_header Auth-Wait 1; + return 204; + } + } +} + +EOF + +$t->run_daemon(\&Test::Nginx::SMTP::smtp_test_daemon); +$t->run()->waitforsocket('127.0.0.1:' . port(8026)); + +############################################################################### + +my $s = Test::Nginx::SMTP->new(); +$s->check(qr/^220 /, "greeting"); + +$s->send('EHLO example.com'); +$s->check(qr/^250 /, "ehlo"); + +$s->send('AUTH PLAIN ' . encode_base64("\0test\@example.com\0secret", '')); +$s->authok('auth plain'); + +$t->reload(); + +TODO: { +local $TODO = 'not yet' unless $t->has_version('1.13.7'); + +ok($s->can_read(), 'mail connection shutdown'); + +} + +undef $s; + +###############################################################################