comparison imap.t @ 107:1c0ec30614c6

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
31 my $t = Test::Nginx->new() 31 my $t = Test::Nginx->new()
32 ->has('mail')->plan(8) 32 ->has('mail')->plan(8)
33 ->run_daemon(\&Test::Nginx::IMAP::imap_test_daemon) 33 ->run_daemon(\&Test::Nginx::IMAP::imap_test_daemon)
34 ->write_file_expand('nginx.conf', <<'EOF')->run(); 34 ->write_file_expand('nginx.conf', <<'EOF')->run();
35 35
36 %%TEST_GLOBALS%%
37
36 master_process off; 38 master_process off;
37 daemon off; 39 daemon off;
38 40
39 events { 41 events {
40 } 42 }
48 protocol imap; 50 protocol imap;
49 } 51 }
50 } 52 }
51 53
52 http { 54 http {
53 access_log off; 55 %%TEST_GLOBALS_HTTP%%
54
55 client_body_temp_path %%TESTDIR%%/client_body_temp;
56 fastcgi_temp_path %%TESTDIR%%/fastcgi_temp;
57 proxy_temp_path %%TESTDIR%%/proxy_temp;
58 56
59 server { 57 server {
60 listen 127.0.0.1:8080; 58 listen 127.0.0.1:8080;
61 server_name localhost; 59 server_name localhost;
62 60