diff options
| author | Christophe Romain <christophe.romain@process-one.net> | 2015-04-08 17:12:05 +0200 |
|---|---|---|
| committer | Christophe Romain <christophe.romain@process-one.net> | 2015-04-21 15:24:16 +0200 |
| commit | e0563e3918984d151fbea45a5f6fc8255913726d (patch) | |
| tree | e62bcc5cc538a722f81c3f53291e02594e576711 /test | |
| parent | Improve join/leave cluster scripts (diff) | |
PubSub improvements
This commit contains
- code cleanup
- use of db_type instead of old mod_pubsub_odbc
- some minor optimizations
- some minor bugfixes
Diffstat (limited to 'test')
| -rw-r--r-- | test/ejabberd_SUITE.erl | 5 | ||||
| -rw-r--r-- | test/ejabberd_SUITE_data/ejabberd.cfg | 9 | ||||
| -rw-r--r-- | test/ejabberd_SUITE_data/ejabberd.yml | 9 |
3 files changed, 14 insertions, 9 deletions
diff --git a/test/ejabberd_SUITE.erl b/test/ejabberd_SUITE.erl index 4606ae0fd..a827a9174 100644 --- a/test/ejabberd_SUITE.erl +++ b/test/ejabberd_SUITE.erl @@ -813,7 +813,7 @@ pubsub(Config) -> node = Node, jid = my_jid(Config)}}]}), ?recv2( - #message{sub_els = [#pubsub_event{}, #delay{}, #legacy_delay{}]}, + #message{sub_els = [#pubsub_event{}, #delay{}]}, #iq{type = result, id = I1}), %% Get subscriptions true = lists:member(?PUBSUB("retrieve-subscriptions"), Features), @@ -860,8 +860,7 @@ pubsub(Config) -> #message{sub_els = [#pubsub_event{ items = [#pubsub_event_items{ node = Node, - retract = [ItemID]}]}, - #shim{headers = [{<<"Collection">>, Node}]}]}), + retract = [ItemID]}]}]}), %% Unsubscribe from node "presence" #iq{type = result, sub_els = []} = send_recv(Config, diff --git a/test/ejabberd_SUITE_data/ejabberd.cfg b/test/ejabberd_SUITE_data/ejabberd.cfg index cb321661e..a92608b60 100644 --- a/test/ejabberd_SUITE_data/ejabberd.cfg +++ b/test/ejabberd_SUITE_data/ejabberd.cfg @@ -94,7 +94,8 @@ {mod_offline, [{db_type, odbc}]}, {mod_privacy, [{db_type, odbc}]}, {mod_private, [{db_type, odbc}]}, - {mod_pubsub_odbc, [{access_createnode, pubsub_createnode}, + {mod_pubsub, [{db_type, odbc}, + {access_createnode, pubsub_createnode}, {ignore_pep_from_offline, true}, {last_item_cache, false}, {plugins, ["flat", "hometree", "pep"]}]}, @@ -114,7 +115,8 @@ {mod_offline, [{db_type, odbc}]}, {mod_privacy, [{db_type, odbc}]}, {mod_private, [{db_type, odbc}]}, - {mod_pubsub_odbc, [{access_createnode, pubsub_createnode}, + {mod_pubsub, [{db_type, odbc}, + {access_createnode, pubsub_createnode}, {ignore_pep_from_offline, true}, {last_item_cache, false}, {plugins, ["flat", "hometree", "pep"]}]}, @@ -133,7 +135,8 @@ {mod_offline, [{db_type, odbc}]}, {mod_privacy, [{db_type, odbc}]}, {mod_private, [{db_type, odbc}]}, - {mod_pubsub_odbc, [{access_createnode, pubsub_createnode}, + {mod_pubsub, [{db_type, odbc}, + {access_createnode, pubsub_createnode}, {ignore_pep_from_offline, true}, {last_item_cache, false}, {plugins, ["flat", "hometree", "pep"]}]}, diff --git a/test/ejabberd_SUITE_data/ejabberd.yml b/test/ejabberd_SUITE_data/ejabberd.yml index c19e22441..0a836b805 100644 --- a/test/ejabberd_SUITE_data/ejabberd.yml +++ b/test/ejabberd_SUITE_data/ejabberd.yml @@ -26,7 +26,8 @@ host_config: db_type: odbc mod_private: db_type: odbc - mod_pubsub_odbc: + mod_pubsub: + db_type: odbc access_createnode: pubsub_createnode ignore_pep_from_offline: true last_item_cache: false @@ -76,7 +77,8 @@ Welcome to this XMPP server." db_type: odbc mod_private: db_type: odbc - mod_pubsub_odbc: + mod_pubsub: + db_type: odbc access_createnode: pubsub_createnode ignore_pep_from_offline: true last_item_cache: false @@ -132,7 +134,8 @@ Welcome to this XMPP server." db_type: odbc mod_private: db_type: odbc - mod_pubsub_odbc: + mod_pubsub: + db_type: odbc access_createnode: pubsub_createnode ignore_pep_from_offline: true last_item_cache: false |