aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2013-02-14 17:43:26 +0100
committerLoïc Hoguin <[email protected]>2013-02-14 17:43:26 +0100
commit0364d71d69011776b2857caff7204954b1d53905 (patch)
tree65b256ffb10e07068c6d8edf6d37d6350eaa941a
parent265e372fd2d5ef121df729bb15a9d90e85cb2b35 (diff)
parent3d8df7f29d5b80322f5703b945ad0f864e5a7ed9 (diff)
downloadranch-0364d71d69011776b2857caff7204954b1d53905.tar.gz
ranch-0364d71d69011776b2857caff7204954b1d53905.tar.bz2
ranch-0364d71d69011776b2857caff7204954b1d53905.zip
Merge branch 'remove-pointless-sleep' of git://github.com/fishcakez/ranch
-rw-r--r--test/acceptor_SUITE.erl1
1 files changed, 0 insertions, 1 deletions
diff --git a/test/acceptor_SUITE.erl b/test/acceptor_SUITE.erl
index 8827ec8..8a8979f 100644
--- a/test/acceptor_SUITE.erl
+++ b/test/acceptor_SUITE.erl
@@ -297,7 +297,6 @@ tcp_infinity_max_connections(_) ->
10 = ranch_server:count_connections(ListenerPid). % count could be off
tcp_upgrade(_) ->
- receive after 20000 -> ok end,
{ok, _} = ranch:start_listener(tcp_upgrade, 1,
ranch_tcp, [{port, 0}],
notify_and_wait_protocol, [{msg, connected}, {pid, self()}]),