diff options
| author | Ingela Anderton Andin <[email protected]> | 2014-03-21 15:23:22 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2014-03-21 15:23:22 +0100 |
| commit | bbe92ec2c359373205149dabc61ef0d50784760f (patch) | |
| tree | 676f4e5ef29372ae03177015ac5854a99e4982e6 /lib/inets/test/httpc_SUITE.erl | |
| parent | 425a75a11ea58125b67ad56f4ed3ca65370a3e72 (diff) | |
| parent | 57f446a999b01dcda42459d2f9f4e6b87d50a128 (diff) | |
| download | otp-bbe92ec2c359373205149dabc61ef0d50784760f.tar.gz otp-bbe92ec2c359373205149dabc61ef0d50784760f.tar.bz2 otp-bbe92ec2c359373205149dabc61ef0d50784760f.zip | |
Merge branch 'ia/inets/revert/OTP-11756'
* ia/inets/revert/OTP-11756:
inets: Continue CTify test suite
inets: Enable https tests
inets: Make test suites independent of each other
inets: Reverted commmit f97cd6965ac35d1cbe510de23592956857d144c8
Diffstat (limited to 'lib/inets/test/httpc_SUITE.erl')
| -rw-r--r-- | lib/inets/test/httpc_SUITE.erl | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/inets/test/httpc_SUITE.erl b/lib/inets/test/httpc_SUITE.erl index fe6edd504e..ba7e82a765 100644 --- a/lib/inets/test/httpc_SUITE.erl +++ b/lib/inets/test/httpc_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2004-2013. All Rights Reserved. +%% Copyright Ericsson AB 2004-2014. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -296,6 +296,9 @@ trace(Config) when is_list(Config) -> pipeline(Config) when is_list(Config) -> Request = {url(group_name(Config), "/dummy.html", Config), []}, {ok, _} = httpc:request(get, Request, [], [], pipeline), + + %% Make sure pipeline session is registerd + test_server:sleep(4000), keep_alive_requests(Request, pipeline). %%-------------------------------------------------------------------- @@ -303,6 +306,9 @@ pipeline(Config) when is_list(Config) -> persistent_connection(Config) when is_list(Config) -> Request = {url(group_name(Config), "/dummy.html", Config), []}, {ok, _} = httpc:request(get, Request, [], [], persistent), + + %% Make sure pipeline session is registerd + test_server:sleep(4000), keep_alive_requests(Request, persistent). %%------------------------------------------------------------------------- |