diff options
Diffstat (limited to 'test/ejabberd_SUITE.erl')
| -rw-r--r-- | test/ejabberd_SUITE.erl | 35 |
1 files changed, 4 insertions, 31 deletions
diff --git a/test/ejabberd_SUITE.erl b/test/ejabberd_SUITE.erl index 553eae1e4..1d8de7b8e 100644 --- a/test/ejabberd_SUITE.erl +++ b/test/ejabberd_SUITE.erl @@ -401,7 +401,7 @@ db_tests(riak) -> presence_broadcast, last, roster_tests:single_cases(), - private, + %%private_tests:single_cases(), privacy_tests:single_cases(), vcard_tests:single_cases(), muc_tests:single_cases(), @@ -424,7 +424,7 @@ db_tests(DB) when DB == mnesia; DB == redis -> presence_broadcast, last, roster_tests:single_cases(), - private, + private_tests:single_cases(), privacy_tests:single_cases(), vcard_tests:single_cases(), pubsub_tests:single_cases(), @@ -455,7 +455,7 @@ db_tests(_) -> presence_broadcast, last, roster_tests:single_cases(), - private, + private_tests:single_cases(), privacy_tests:single_cases(), vcard_tests:single_cases(), pubsub_tests:single_cases(), @@ -602,7 +602,7 @@ test_connect_bad_ns_stream(Config) -> test_connect_bad_lang(Config) -> Lang = iolist_to_binary(lists:duplicate(36, $x)), Config0 = init_stream(set_opt(lang, Lang, Config)), - ?recv1(#stream_error{reason = 'policy-violation'}), + ?recv1(#stream_error{reason = 'invalid-xml'}), ?recv1({xmlstreamend, <<"stream:stream">>}), close_socket(Config0). @@ -978,33 +978,6 @@ disco(Config) -> end, Items), disconnect(Config). -private(Config) -> - Conference = #bookmark_conference{name = <<"Some name">>, - autojoin = true, - jid = jid:make( - <<"some">>, - <<"some.conference.org">>, - <<>>)}, - Storage = #bookmark_storage{conference = [Conference]}, - StorageXMLOut = xmpp:encode(Storage), - WrongEl = #xmlel{name = <<"wrong">>}, - #iq{type = error} = - send_recv(Config, #iq{type = get, - sub_els = [#private{sub_els = [WrongEl]}]}), - #iq{type = result, sub_els = []} = - send_recv( - Config, #iq{type = set, - sub_els = [#private{sub_els = [WrongEl, StorageXMLOut]}]}), - #iq{type = result, - sub_els = [#private{sub_els = [StorageXMLIn]}]} = - send_recv( - Config, - #iq{type = get, - sub_els = [#private{sub_els = [xmpp:encode( - #bookmark_storage{})]}]}), - Storage = xmpp:decode(StorageXMLIn), - disconnect(Config). - last(Config) -> true = is_feature_advertised(Config, ?NS_LAST), #iq{type = result, sub_els = [#last{}]} = |