Merge pull request #1241 from esl/pubsub_SUITE-to-cover-refactor_rebase

Improve mod_pubsub test coverage

apps/ejabberd/src/mod_caps.erl

@@ -50,8 +50,8 @@
          c2s_presence_in/2, c2s_filter_packet/6,
          c2s_broadcast_recipients/6]).
 
-%% cleanup for test cases
--export([delete_caps/1]).
+%% for test cases
+-export([delete_caps/1, make_disco_hash/2]).
 
 -include("ejabberd.hrl").
 

rebar.config

@@ -88,13 +88,13 @@
                                  {overlay_vars, "rel/vars.config"},
                                  {overlay, [{template, "rel/files/ejabberd.cfg", "etc/ejabberd.cfg"}]} ]}]},
              %% development nodes
-             {mim1,    [{relx, [ {overlay_vars, "rel/mim1.vars.config"},
+             {mim1,    [{relx, [ {overlay_vars, ["rel/vars.config", "rel/mim1.vars.config"]},
                                  {overlay, [{template, "rel/files/ejabberd.cfg", "etc/ejabberd.cfg"}]} ]}]},
-             {mim2,    [{relx, [ {overlay_vars, "rel/mim2.vars.config"},
+             {mim2,    [{relx, [ {overlay_vars, ["rel/vars.config", "rel/mim2.vars.config"]},
                                  {overlay, [{template, "rel/files/ejabberd.cfg", "etc/ejabberd.cfg"}]} ]}]},
-             {mim3,    [{relx, [ {overlay_vars, "rel/mim3.vars.config"},
+             {mim3,    [{relx, [ {overlay_vars, ["rel/vars.config", "rel/mim3.vars.config"]},
                                  {overlay, [{template, "rel/files/ejabberd.cfg", "etc/ejabberd.cfg"}]} ]}]},
-             {fed1,    [{relx, [ {overlay_vars, "rel/fed1.vars.config"},
+             {fed1,    [{relx, [ {overlay_vars, ["rel/vars.config", "rel/fed1.vars.config"]},
                                  {overlay, [{template, "rel/files/ejabberd.cfg", "etc/ejabberd.cfg"}]} ]}]} ]}.
 
 {plugins,

rel/fed1.vars.config

@@ -23,6 +23,7 @@
 {all_metrics_are_global, false}.
 {c2s_dhfile, ",{dhfile, \"priv/ssl/fake_dh_server.pem\"}"}.
 {s2s_dhfile, ",{dhfile, \"priv/ssl/fake_dh_server.pem\"}"}.
+
 {mongooseim_runner_user, []}.
 {mongooseim_script_dir, "$(cd ${0%/*} && pwd)"}.
 {mongooseim_etc_dir, "$RUNNER_BASE_DIR/etc"}.

rel/mim1.vars.config

@@ -56,6 +56,7 @@
 {s2s_certfile, "{s2s_certfile, \"priv/ssl/fake_server.pem\"}."}.
 {c2s_dhfile, ",{dhfile, \"priv/ssl/fake_dh_server.pem\"}"}.
 {s2s_dhfile, ",{dhfile, \"priv/ssl/fake_dh_server.pem\"}"}.
+
 {mongooseim_runner_user, []}.
 {mongooseim_script_dir, "$(cd ${0%/*} && pwd)"}.
 {mongooseim_etc_dir, "$RUNNER_BASE_DIR/etc"}.

rel/mim2.vars.config

@@ -46,6 +46,7 @@
 {all_metrics_are_global, true}.
 {c2s_dhfile, ",{dhfile, \"priv/ssl/fake_dh_server.pem\"}"}.
 {s2s_dhfile, ",{dhfile, \"priv/ssl/fake_dh_server.pem\"}"}.
+
 {mongooseim_runner_user, []}.
 {mongooseim_script_dir, "$(cd ${0%/*} && pwd)"}.
 {mongooseim_etc_dir, "$RUNNER_BASE_DIR/etc"}.

rel/mim3.vars.config

@@ -35,6 +35,7 @@
 {all_metrics_are_global, false}.
 {c2s_dhfile, ",{dhfile, \"priv/ssl/fake_dh_server.pem\"}"}.
 {s2s_dhfile, ",{dhfile, \"priv/ssl/fake_dh_server.pem\"}"}.
+
 {mongooseim_runner_user, []}.
 {mongooseim_script_dir, "$(cd ${0%/*} && pwd)"}.
 {mongooseim_etc_dir, "$RUNNER_BASE_DIR/etc"}.

test.disabled/ejabberd_tests/rebar.config

@@ -11,7 +11,7 @@
         {jiffy, ".*", {git, "git://github.com/davisp/jiffy.git", "0.14.8"}},
         {proper, ".*", {git, "https://github.com/manopapad/proper.git", "v1.2"}},
         {exml, ".*", {git, "git://github.com/esl/exml.git", "d365533"}},
-        {escalus, ".*", {git, "git://github.com/esl/escalus.git", "9c9fb51"}},
+        {escalus, ".*", {git, "git://github.com/esl/escalus.git", "1091afe"}},
         %% Switch cowboy to upstream after ditching support for OTP 17.x
         {cowboy, ".*", {git, "git://github.com/rslota/cowboy.git", {tag, "2.0.0-pre.7-r17"}}},
         {shotgun, ".*", {git, "https://github.com/inaka/shotgun.git", "4e67065"}},