Test that test cases succeed

1 files changed, 18 insertions, 28 deletions

diff --git a/lib/common_test/test/ct_master_SUITE.erl b/lib/common_test/test/ct_master_SUITE.erl
index 27243a0067..56006fbfe8 100644
--- a/lib/common_test/test/ct_master_SUITE.erl
+++ b/lib/common_test/test/ct_master_SUITE.erl
@@ -117,14 +117,8 @@ ct_master_test(Config) when is_list(Config) ->
 			       reformat(Events, ?eh),
 			       PrivDir, []),
 
-    find_events(NodeNames, [{tc_start,{master_SUITE,init_per_suite}},
-			    {tc_start,{master_SUITE,first_testcase}},
-			    {tc_start,{master_SUITE,second_testcase}},
-			    {tc_start,{master_SUITE,third_testcase}},
-			    {tc_start,{master_SUITE,end_per_suite}}],
-	       Events),
-    
-    ok.
+    TestEvents = events_to_check(ct_master_test),
+    ok = find_events(NodeNames, TestEvents, Events, Config).
 
 %%%-----------------------------------------------------------------
 %%% HELP FUNCTIONS
@@ -210,28 +204,24 @@ reformat(Events, EH) ->
 %%%-----------------------------------------------------------------
 %%% TEST EVENTS
 %%%-----------------------------------------------------------------
-find_events([], _CheckEvents, _) ->
-    ok;
-find_events([NodeName|NodeNames],CheckEvents,AllEvents) ->
-    find_events(NodeNames, CheckEvents,
-		remove_events(add_host(NodeName),CheckEvents, AllEvents, [])).
-
-remove_events(Node,[{Name,Data} | RestChecks],
-	      [{?eh,#event{ name = Name, node = Node, data = Data }}|RestEvs],
-	       Acc) ->
-    remove_events(Node, RestChecks, RestEvs, Acc);
-remove_events(Node, Checks, [Event|RestEvs], Acc) ->
-    remove_events(Node, Checks, RestEvs, [Event | Acc]);
-remove_events(_Node, [], [], Acc) ->
-    lists:reverse(Acc);
-remove_events(Node, Events, [], Acc) ->
-    test_server:format("Could not find events: ~p in ~p for node ~p",
-	   [Events, lists:reverse(Acc), Node]),
-    exit(event_not_found).
+
+find_events(NodeNames, TestEvents, Events, Config) ->
+    [begin
+	 Node = add_host(Node0),
+	 io:format("Searching for events for node: ~s", [Node]),
+	 ok = ct_test_support:verify_events(TestEvents, Events, Node, Config),
+	 io:nl()
+     end || Node0 <- NodeNames],
+    ok.
 
 add_host(NodeName) ->
     {ok, HostName} = inet:gethostname(),
     list_to_atom(atom_to_list(NodeName)++"@"++HostName).
     
-expected_events(_) ->
-    [].
+events_to_check(_) ->
+    [{?eh,tc_start,{master_SUITE,first_testcase}},
+     {?eh,tc_done,{master_SUITE,first_testcase,ok}},
+     {?eh,tc_start,{master_SUITE,second_testcase}},
+     {?eh,tc_done,{master_SUITE,second_testcase,ok}},
+     {?eh,tc_start,{master_SUITE,third_testcase}},
+     {?eh,tc_done,{master_SUITE,third_testcase,ok}}].