Mercurial > hg > nginx-tests

comparison smtp.t @ 107:1c0ec30614c6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Tests: add TEST_GLOBALS and TEST_GLOBALS_HTTP config chunks. TEST_GLOBALS replaces previously used -g switch. This allows tests to be executed on 0.6.* branch. For compatibility with old tests -g switch will be used if TEST_GLOBALS wasn't expaneded in config. TEST_GLOBALS_HTTP replaces multiple variables (access_log, root, client_body_temp_path, proxy_temp_path, fastcgi_temp_path) previously specified directly in test configs. This change reduce duplication and allows tests to be used with nginx compiled without fastcgi and/or proxy modules (as proxy_temp_path and fastcgi_temp_path are added conditionally).
author Maxim Dounin <mdounin@mdounin.ru>
date Wed, 14 Oct 2009 02:23:52 +0400
parents ecff5407867c
children 8ac1faaddd2c
comparison
equal deleted inserted replaced
106:7a712d3909ba 107:1c0ec30614c6
29 29
30 my $t = Test::Nginx->new() 30 my $t = Test::Nginx->new()
31 ->has('mail')->plan(25) 31 ->has('mail')->plan(25)
32 ->run_daemon(\&Test::Nginx::SMTP::smtp_test_daemon) 32 ->run_daemon(\&Test::Nginx::SMTP::smtp_test_daemon)
33 ->write_file_expand('nginx.conf', <<'EOF')->run(); 33 ->write_file_expand('nginx.conf', <<'EOF')->run();
34
35 %%TEST_GLOBALS%%
34 36
35 master_process off; 37 master_process off;
36 daemon off; 38 daemon off;
37 39
38 events { 40 events {
49 smtp_auth login plain none; 51 smtp_auth login plain none;
50 } 52 }
51 } 53 }
52 54
53 http { 55 http {
54 access_log off; 56 %%TEST_GLOBALS_HTTP%%
55
56 client_body_temp_path %%TESTDIR%%/client_body_temp;
57 fastcgi_temp_path %%TESTDIR%%/fastcgi_temp;
58 proxy_temp_path %%TESTDIR%%/proxy_temp;
59 57
60 server { 58 server {
61 listen 127.0.0.1:8080; 59 listen 127.0.0.1:8080;
62 server_name localhost; 60 server_name localhost;
63 61