Mercurial > hg > nginx-tests

comparison smtp-xclient.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
27 27
28 my $t = Test::Nginx->new()->has('mail')->plan(6) 28 my $t = Test::Nginx->new()->has('mail')->plan(6)
29 ->run_daemon(\&Test::Nginx::SMTP::smtp_test_daemon) 29 ->run_daemon(\&Test::Nginx::SMTP::smtp_test_daemon)
30 ->write_file_expand('nginx.conf', <<'EOF')->run(); 30 ->write_file_expand('nginx.conf', <<'EOF')->run();
31 31
32 %%TEST_GLOBALS%%
33
32 master_process off; 34 master_process off;
33 daemon off; 35 daemon off;
34 36
35 events { 37 events {
36 } 38 }
46 smtp_auth login plain none; 48 smtp_auth login plain none;
47 } 49 }
48 } 50 }
49 51
50 http { 52 http {
51 access_log off; 53 %%TEST_GLOBALS_HTTP%%
52
53 client_body_temp_path %%TESTDIR%%/client_body_temp;
54 fastcgi_temp_path %%TESTDIR%%/fastcgi_temp;
55 proxy_temp_path %%TESTDIR%%/proxy_temp;
56 54
57 server { 55 server {
58 listen 127.0.0.1:8080; 56 listen 127.0.0.1:8080;
59 server_name localhost; 57 server_name localhost;
60 58