Merge pull request #106 from esl/websocket-fix

Websocket fix
esl · Jan 13, 2015 · c657f5f · c657f5f
2 parents 55a21d0 + aeeee10
commit c657f5f
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 5 deletions.
diff --git a/src/ct_tty_hook.erl b/src/ct_tty_hook.erl
@@ -43,7 +43,6 @@ init(_Id, Opts) ->
 
 %% @doc Called before init_per_suite is called.
 pre_init_per_suite(Suite,Config,State) ->
-    escalus_ejabberd:rpc(error_logger, warning_msg, ["====== Starting SUITE ~p", [Suite]]),
     {Config, State#state{ suite_total = 0, tcs = [] }}.
 
 %% @doc Called after init_per_suite.
@@ -56,7 +55,6 @@ pre_end_per_suite(_Suite,Config,State) ->
 
 %% @doc Called after end_per_suite.
 post_end_per_suite(Suite,_Config,Return,State) ->
-    escalus_ejabberd:rpc(error_logger, warning_msg, ["====== Finished SUITE ~p", [Suite]]),
     Data = {suites, Suite, State#state.suite_total, lists:reverse(State#state.tcs)},
     {Return, State#state{ data = [Data | State#state.data] ,
                           total = State#state.total + State#state.suite_total } }.

diff --git a/tests/sm_SUITE.erl b/tests/sm_SUITE.erl
@@ -43,6 +43,7 @@ groups() ->
       [shuffle, {repeat, 5}], [client_acks_more_than_sent,
                                too_many_unacked_stanzas,
                                server_requests_ack,
+                               server_requests_ack_after_session,
                                resend_more_offline_messages_than_buffer_size
                               ]},
      {reconnection, [shuffle, {repeat, 5}], [
@@ -110,6 +111,9 @@ init_per_testcase(server_requests_ack = CaseName, Config) ->
                   end,
     NewConfig = escalus_ejabberd:setup_option(ack_freq(AckFreq), Config),
     escalus:init_per_testcase(CaseName, NewConfig);
+init_per_testcase(server_requests_ack_after_session = CaseName, Config) ->
+    NewConfig = escalus_ejabberd:setup_option(ack_freq(1), Config),
+    escalus:init_per_testcase(CaseName, NewConfig);
 init_per_testcase(CaseName, Config) ->
     escalus:init_per_testcase(CaseName, Config).
 
@@ -127,6 +131,9 @@ end_per_testcase(server_requests_ack = CaseName, Config) ->
                   end,
     NewConfig = escalus_ejabberd:reset_option(ack_freq(AckFreq), Config),
     escalus:end_per_testcase(CaseName, NewConfig);
+end_per_testcase(server_requests_ack_after_session = CaseName, Config) ->
+    NewConfig = escalus_ejabberd:reset_option(ack_freq(1), Config),
+    escalus:end_per_testcase(CaseName, NewConfig);
 end_per_testcase(wait_for_resumption = CaseName, Config) ->
     discard_offline_messages(Config, alice),
     clear_session_table(),
@@ -328,6 +335,20 @@ server_requests_ack(Config) ->
     end),
     discard_offline_messages(Config, alice).
 
+server_requests_ack_after_session(Config) ->
+    AliceSpec = escalus_users:get_options(Config, alice),
+    {ok, Alice, _, _} = escalus_connection:start(AliceSpec,
+                                                 [start_stream,
+                                                  stream_features,
+                                                  maybe_use_ssl,
+                                                  authenticate,
+                                                  bind,
+                                                  stream_management,
+                                                  session
+                                                 ]),
+    escalus:assert(is_sm_ack_request, escalus_connection:get_stanza(Alice, stream_mgmt_req)).
+
+
 resend_more_offline_messages_than_buffer_size(Config) ->
     ConnSteps =  [start_stream,
                   stream_features,

diff --git a/tests/websockets_SUITE.erl b/tests/websockets_SUITE.erl
@@ -67,7 +67,9 @@ chat_msg(Config) ->
     escalus:story(Config, [{alice, 1}, {geralt, 1}, {oldie, 1}], fun(Alice, Geralt, Oldie) ->
 
         escalus_client:send(Alice, escalus_stanza:chat_to(Geralt, <<"Hi!">>)),
-        escalus:assert(is_chat_message, [<<"Hi!">>], escalus_client:wait_for_stanza(Geralt)),
+        FromAlice = escalus_client:wait_for_stanza(Geralt),
+        escalus:assert(is_chat_message, [<<"Hi!">>], FromAlice),
+        escalus:assert(has_ns, [<<"jabber:client">>], FromAlice),
 
         escalus_client:send(Geralt, escalus_stanza:chat_to(Alice, <<"Hello!">>)),
         escalus:assert(is_chat_message, [<<"Hello!">>], escalus_client:wait_for_stanza(Alice)),
@@ -91,8 +93,6 @@ escape_attrs(Config) ->
         special_chars_helper:check_attr_from_to(Geralt, Alice),
         special_chars_helper:check_attr_from_to(Geralt, Oldie)
 
-
-
     end).
 
 %%--------------------------------------------------------------------