diff options
| author | Hans Nilsson <[email protected]> | 2016-04-13 15:35:41 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2016-04-29 13:17:52 +0200 |
| commit | 8bfcd11948895164d1841c0c00450b0e26cb9927 (patch) | |
| tree | ca2541cbf9017aec0f10a0675548b84cc5196307 /lib/ssh/test/ssh_sup_SUITE.erl | |
| parent | 020e62c9619b518620d216cf0caef55fe129d4c3 (diff) | |
| download | otp-8bfcd11948895164d1841c0c00450b0e26cb9927.tar.gz otp-8bfcd11948895164d1841c0c00450b0e26cb9927.tar.bz2 otp-8bfcd11948895164d1841c0c00450b0e26cb9927.zip | |
ssh: break out test macro ?wait_match into new ssh_test_lib.hrl
Diffstat (limited to 'lib/ssh/test/ssh_sup_SUITE.erl')
| -rw-r--r-- | lib/ssh/test/ssh_sup_SUITE.erl | 27 |
1 files changed, 3 insertions, 24 deletions
diff --git a/lib/ssh/test/ssh_sup_SUITE.erl b/lib/ssh/test/ssh_sup_SUITE.erl index d43a9cb425..2dc4263603 100644 --- a/lib/ssh/test/ssh_sup_SUITE.erl +++ b/lib/ssh/test/ssh_sup_SUITE.erl @@ -22,14 +22,16 @@ -module(ssh_sup_SUITE). -include_lib("common_test/include/ct.hrl"). -include_lib("ssh/src/ssh.hrl"). +-include("ssh_test_lib.hrl"). %% Note: This directive should only be used in test suites. -compile(export_all). --define(WAIT_FOR_SHUTDOWN, 500). -define(USER, "Alladin"). -define(PASSWD, "Sesame"). +-define(WAIT_FOR_SHUTDOWN, 500). + %%-------------------------------------------------------------------- %% Common Test interface functions ----------------------------------- %%-------------------------------------------------------------------- @@ -80,29 +82,6 @@ end_per_testcase(_, _Config) -> ssh:stop(). %%------------------------------------------------------------------------- -%% Help macro -%%------------------------------------------------------------------------- --define(wait_match(Pattern, FunctionCall, Bind), - Bind = - (fun() -> - F = fun(N, F1) -> - case FunctionCall of - Pattern -> Bind; - _ when N>0 -> - ct:pal("Must sleep ~p ms at ~p:~p",[?WAIT_FOR_SHUTDOWN,?MODULE,?LINE]), - timer:sleep(?WAIT_FOR_SHUTDOWN), - F1(N-1, F1); - Other -> - ct:fail("Unexpected ~p:~p ~p",[?MODULE,?LINE,Other]) - end - end, - F((5000 div ?WAIT_FOR_SHUTDOWN), F) - end)() - ). - --define(wait_match(Pattern, FunctionCall), ?wait_match(Pattern, FunctionCall, ok)). - -%%------------------------------------------------------------------------- %% Test cases %%------------------------------------------------------------------------- default_tree() -> |