File 0165-megaco-udp-test-Removed-wait-command-from-... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0165-megaco-udp-test-Removed-wait-command-from-command-se.patch of Package erlang

From b3ede4e9465d57ed72644d1a0e3a6f980f8950e1 Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Wed, 7 Apr 2021 18:15:14 +0200
Subject: [PATCH 2/2] [megaco|udp|test] Removed wait command from command
 sequence

---
 lib/megaco/test/megaco_udp_SUITE.erl | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/lib/megaco/test/megaco_udp_SUITE.erl b/lib/megaco/test/megaco_udp_SUITE.erl
index 2f395ab673..e8fea517f6 100644
--- a/lib/megaco/test/megaco_udp_SUITE.erl
+++ b/lib/megaco/test/megaco_udp_SUITE.erl
@@ -748,48 +748,42 @@ block_unblock_server_commands(TO, Port) ->
 	       end},
 
      #{id   => 7,
-       desc => "Await continue",
+       desc => "Await continue - and nothing else",
        cmd  => fun(State) ->
 		       server_await_continue_signal(State, TO)
 	       end},
 
      #{id   => 8,
-       desc => "Send message (hejsan)",
+       desc => "Send message (hejsan) (client is blocked)",
        cmd  => fun(State) -> 
 		       server_send_message(State, "hejsan") 
 	       end},
 
      #{id   => 9,
-       desc => "Await nothing before receiving (hoppsan) reply",
-       cmd  => fun(State) -> 
-		       server_await_nothing(State, TO div 2)
-	       end},
-
-     #{id   => 10,
        desc => "Await reply (hoppsan) to message",
        cmd  => fun(State) -> 
 		       server_await_message(State, "hoppsan", TO)
 	       end},
 
-     #{id   => 11,
+     #{id   => 10,
        desc => "Await nothing before closing",
        cmd  => fun(State) -> 
 		       server_await_nothing(State, TO div 5)
 	       end},
 
-     #{id   => 12,
+     #{id   => 11,
        desc => "Close",
        cmd  => fun(State) -> 
 		       server_close(State) 
 	       end},
 
-     #{id   => 13,
+     #{id   => 12,
        desc => "Await nothing before stopping transport",
        cmd  => fun(State) -> 
 		       server_await_nothing(State, TO div 5)
 	       end},
 
-     #{id   => 14,
+     #{id   => 13,
        desc => "Stop",
        cmd  => fun(State) -> 
 		       server_stop_transport(State) 
@@ -899,7 +893,7 @@ block_unblock_client_commands(TO, ServerPort, ServerHost) ->
                                      [Active, erlang:port_info(Socket)]),
                                    ok
                            end,
-		       client_await_nothing(State, Fail, TO)
+		       client_await_nothing(State, Fail, TO div 2)
 	       end},
 
      #{id   => 13,
@@ -1083,7 +1077,11 @@ server_await_continue_signal(#{parent := Parent} = State, Timeout) ->
     receive
 	{continue, Parent} ->
             p("received expected continue signal"),
-	    {ok, State}
+	    {ok, State};
+        Any ->
+            p("received UNEXPECTED message: "
+              "~n   ~p", [Any]),
+            {error, {unexpected, Any}}
     after Timeout ->
 	    {error, timeout}
     end.
-- 
2.26.2

Places

File 0165-megaco-udp-test-Removed-wait-command-from-command-se.patch of Package erlang

Places