diff options
| author | Ingela Anderton Andin <[email protected]> | 2014-03-31 12:16:00 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2014-03-31 12:16:00 +0200 |
| commit | b7764ebe9c9284c242774f6d076a8c6d190638fa (patch) | |
| tree | 9395883c0965398600567bafd66cdca68625062c /lib | |
| parent | f6ed75e94d3ed5cce6d26f7a3b3d6d851c1a9d03 (diff) | |
| parent | e34bd5734c236a713f5f78cc53de5308e1afeee3 (diff) | |
| download | otp-b7764ebe9c9284c242774f6d076a8c6d190638fa.tar.gz otp-b7764ebe9c9284c242774f6d076a8c6d190638fa.tar.bz2 otp-b7764ebe9c9284c242774f6d076a8c6d190638fa.zip | |
Merge branch 'ia/inets/test-case-cuddling'
* ia/inets/test-case-cuddling:
inets: Avoid timing issus in test case code
inets: Avoid Windows XP port problems
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/inets/test/httpd_SUITE.erl | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/inets/test/httpd_SUITE.erl b/lib/inets/test/httpd_SUITE.erl index 3eb8a0818f..4be20d3a69 100644 --- a/lib/inets/test/httpd_SUITE.erl +++ b/lib/inets/test/httpd_SUITE.erl @@ -168,7 +168,12 @@ init_per_group(http_1_1, Config) -> init_per_group(http_1_0, Config) -> [{http_version, "HTTP/1.0"} | Config]; init_per_group(http_0_9, Config) -> - [{http_version, "HTTP/0.9"} | Config]; + case {os:type(), os:version()} of + {{win32, _}, {5,1,2600}} -> + {skip, "eaddrinuse XP problem"}; + _ -> + [{http_version, "HTTP/0.9"} | Config] + end; init_per_group(http_htaccess = Group, Config) -> Path = ?config(doc_root, Config), catch remove_htaccess(Path), @@ -1099,7 +1104,7 @@ do_max_clients(Config) -> BlockRequest = http_request("GET /eval?httpd_example:delay(2000) ", Version, Host), {ok, Socket} = inets_test_lib:connect_bin(Type, Host, Port, transport_opts(Type, Config)), inets_test_lib:send(Type, Socket, BlockRequest), - ct:sleep(100), + ct:sleep(100), %% Avoid possible timing issues ok = httpd_test_lib:verify_request(Type, Host, Port, transport_opts(Type, Config), @@ -1112,6 +1117,7 @@ do_max_clients(Config) -> ok end, inets_test_lib:close(Type, Socket), + ct:sleep(100), %% Avoid possible timing issues ok = httpd_test_lib:verify_request(Type, Host, Port, transport_opts(Type, Config), |