From 8bfcd11948895164d1841c0c00450b0e26cb9927 Mon Sep 17 00:00:00 2001
From: Hans Nilsson <hans@erlang.org>
Date: Wed, 13 Apr 2016 15:35:41 +0200
Subject: ssh: break out test macro ?wait_match into new ssh_test_lib.hrl

---
 lib/ssh/test/ssh_sup_SUITE.erl | 27 +++------------------------
 1 file changed, 3 insertions(+), 24 deletions(-)

(limited to 'lib/ssh/test/ssh_sup_SUITE.erl')

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 -----------------------------------
 %%--------------------------------------------------------------------
@@ -79,29 +81,6 @@ end_per_testcase(sshc_subtree, Config) ->
 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 
 %%-------------------------------------------------------------------------
-- 
cgit v1.2.3