diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/ejabberd_SUITE.erl | 4 | ||||
| -rw-r--r-- | test/ejabberd_SUITE_data/ejabberd.yml | 15 | ||||
| -rw-r--r-- | test/pubsub_tests.erl | 4 |
3 files changed, 20 insertions, 3 deletions
diff --git a/test/ejabberd_SUITE.erl b/test/ejabberd_SUITE.erl index 97c56159a..0479c593f 100644 --- a/test/ejabberd_SUITE.erl +++ b/test/ejabberd_SUITE.erl @@ -460,6 +460,7 @@ db_tests(_) -> muc_tests:single_cases(), offline_tests:single_cases(), mam_tests:single_cases(), + push_tests:single_cases(), test_unregister]}, muc_tests:master_slave_cases(), privacy_tests:master_slave_cases(), @@ -469,7 +470,8 @@ db_tests(_) -> mam_tests:master_slave_cases(), vcard_tests:master_slave_cases(), announce_tests:master_slave_cases(), - carbons_tests:master_slave_cases()]. + carbons_tests:master_slave_cases(), + push_tests:master_slave_cases()]. ldap_tests() -> [{ldap_tests, [sequence], diff --git a/test/ejabberd_SUITE_data/ejabberd.yml b/test/ejabberd_SUITE_data/ejabberd.yml index a648cb422..b73d6a67f 100644 --- a/test/ejabberd_SUITE_data/ejabberd.yml +++ b/test/ejabberd_SUITE_data/ejabberd.yml @@ -52,7 +52,12 @@ host_config: mod_disco: [] mod_ping: [] mod_proxy65: [] + mod_push: + db_type: sql + mod_push_keepalive: [] mod_s2s_dialback: [] + mod_stream_mgmt: + resume_timeout: 3 mod_legacy_auth: [] mod_register: welcome_message: @@ -110,7 +115,12 @@ Welcome to this XMPP server." mod_disco: [] mod_ping: [] mod_proxy65: [] + mod_push: + db_type: sql + mod_push_keepalive: [] mod_s2s_dialback: [] + mod_stream_mgmt: + resume_timeout: 3 mod_legacy_auth: [] mod_register: welcome_message: @@ -173,7 +183,12 @@ Welcome to this XMPP server." mod_disco: [] mod_ping: [] mod_proxy65: [] + mod_push: + db_type: sql + mod_push_keepalive: [] mod_s2s_dialback: [] + mod_stream_mgmt: + resume_timeout: 3 mod_legacy_auth: [] mod_register: welcome_message: diff --git a/test/pubsub_tests.erl b/test/pubsub_tests.erl index 9cdbd1586..92423c9d9 100644 --- a/test/pubsub_tests.erl +++ b/test/pubsub_tests.erl @@ -108,7 +108,7 @@ test_configure(Config) -> [{title, NodeTitle}]), set_node_config(Config, Node, MyNodeConfig), NewNodeConfig = get_node_config(Config, Node), - NodeTitle = proplists:get_value(title, NewNodeConfig), + NodeTitle = proplists:get_value(title, NewNodeConfig, <<>>), disconnect(Config). test_default(Config) -> @@ -122,7 +122,7 @@ test_create_configure(Config) -> [{title, NodeTitle}]), Node = create_node(Config, <<>>, CustomNodeConfig), NodeConfig = get_node_config(Config, Node), - NodeTitle = proplists:get_value(title, NodeConfig), + NodeTitle = proplists:get_value(title, NodeConfig, <<>>), delete_node(Config, Node), disconnect(Config). |