Allow configuring proxy65 port in tests

diff --git a/test/ejabberd_SUITE_data/ejabberd.ldap.yml b/test/ejabberd_SUITE_data/ejabberd.ldap.yml
index 5c481cbc6b6d6c786ab54deaab8e4074f62fe4cf..a60d227dac40ca0637e48ba873c35e01b3770d8f 100644 (file)
--- a/test/ejabberd_SUITE_data/ejabberd.ldap.yml
+++ b/test/ejabberd_SUITE_data/ejabberd.ldap.yml
@@ -24,7 +24,8 @@ define_macro:
       mod_configure: []
       mod_disco: []
       mod_ping: []
-      mod_proxy65: []
+      mod_proxy65:
+        port: PROXY_PORT
       mod_register:
         welcome_message:
           subject: "Welcome!"

diff --git a/test/ejabberd_SUITE_data/ejabberd.mnesia.yml b/test/ejabberd_SUITE_data/ejabberd.mnesia.yml
index bb57d0858cae80a1f481b65cf4906659b80921a2..14bb2bff20e9f1791d6e7e3efd3e815a31d0f799 100644 (file)
--- a/test/ejabberd_SUITE_data/ejabberd.mnesia.yml
+++ b/test/ejabberd_SUITE_data/ejabberd.mnesia.yml
@@ -46,7 +46,8 @@ define_macro:
       mod_configure: []
       mod_disco: []
       mod_ping: []
-      mod_proxy65: []
+      mod_proxy65:
+        port: PROXY_PORT
       mod_push:
         include_body: false
       mod_push_keepalive: []

diff --git a/test/ejabberd_SUITE_data/ejabberd.mysql.yml b/test/ejabberd_SUITE_data/ejabberd.mysql.yml
index eb81c6c30e3d52764a5bcdf9103176b654a71131..411901976b480ea2ae3026a255fc70fc9f6212f1 100644 (file)
--- a/test/ejabberd_SUITE_data/ejabberd.mysql.yml
+++ b/test/ejabberd_SUITE_data/ejabberd.mysql.yml
@@ -52,7 +52,8 @@ define_macro:
       mod_configure: []
       mod_disco: []
       mod_ping: []
-      mod_proxy65: []
+      mod_proxy65:
+        port: PROXY_PORT
       mod_push:
         db_type: sql
         include_body: false

diff --git a/test/ejabberd_SUITE_data/ejabberd.pgsql.yml b/test/ejabberd_SUITE_data/ejabberd.pgsql.yml
index d7d43c9c4616fb546d53b805c7297c74cff46fd7..c0cd0b0d6568ac46506eb1cbc385b6ecc90f3f9a 100644 (file)
--- a/test/ejabberd_SUITE_data/ejabberd.pgsql.yml
+++ b/test/ejabberd_SUITE_data/ejabberd.pgsql.yml
@@ -52,7 +52,8 @@ define_macro:
       mod_configure: []
       mod_disco: []
       mod_ping: []
-      mod_proxy65: []
+      mod_proxy65:
+        port: PROXY_PORT
       mod_push:
         db_type: sql
         include_body: false

diff --git a/test/ejabberd_SUITE_data/ejabberd.redis.yml b/test/ejabberd_SUITE_data/ejabberd.redis.yml
index 5988c5b4d4b986dcdc2d1bc1cb54931e02ddc9ba..7065f0ffd9a9fbdcc70c6ac44da587641a89cc6b 100644 (file)
--- a/test/ejabberd_SUITE_data/ejabberd.redis.yml
+++ b/test/ejabberd_SUITE_data/ejabberd.redis.yml
@@ -47,7 +47,8 @@ define_macro:
       mod_configure: []
       mod_disco: []
       mod_ping: []
-      mod_proxy65: []
+      mod_proxy65:
+        port: PROXY_PORT
       mod_push:
         include_body: false
       mod_push_keepalive: []

diff --git a/test/ejabberd_SUITE_data/ejabberd.sqlite.yml b/test/ejabberd_SUITE_data/ejabberd.sqlite.yml
index 9efaf216eaca6b5783c8f14d2987fe71e5df27f9..3e22f6a2d74af1d4379c255749a70c86e98504d1 100644 (file)
--- a/test/ejabberd_SUITE_data/ejabberd.sqlite.yml
+++ b/test/ejabberd_SUITE_data/ejabberd.sqlite.yml
@@ -46,7 +46,8 @@ define_macro:
       mod_configure: []
       mod_disco: []
       mod_ping: []
-      mod_proxy65: []
+      mod_proxy65:
+        port: PROXY_PORT
       mod_push:
         db_type: sql
         include_body: false

diff --git a/test/ejabberd_SUITE_data/ejabberd.yml b/test/ejabberd_SUITE_data/ejabberd.yml
index 2bf090d5cfe76be7c7757c07c8669da24267cb8f..cea93fe902300af5a0ee99cada57b7551526c559 100644 (file)
--- a/test/ejabberd_SUITE_data/ejabberd.yml
+++ b/test/ejabberd_SUITE_data/ejabberd.yml
@@ -101,6 +101,7 @@ modules:
   mod_disco: []
   mod_ping: []
   mod_proxy65:
+    port: PROXY_PORT
     vcard: VCARD
   mod_muc:
     vcard: VCARD

diff --git a/test/ejabberd_SUITE_data/macros.yml b/test/ejabberd_SUITE_data/macros.yml
index 047d363ebbca6cc6686a7f73179cb951d672f4bf..fdd46758400123b9f4879dc2cb38bd17bc268212 100644 (file)
--- a/test/ejabberd_SUITE_data/macros.yml
+++ b/test/ejabberd_SUITE_data/macros.yml
@@ -5,6 +5,7 @@ define_macro:
   S2S_PORT: @@s2s_port@@
   WEB_PORT: @@web_port@@
   COMPONENT_PORT: @@component_port@@
+  PROXY_PORT: @@proxy_port@@
   PASSWORD: >-
     @@password@@
   LOGLEVEL: @@loglevel@@

diff --git a/test/suite.erl b/test/suite.erl
index 7c565eacc32a46f423b13849c594a35ea65a0a47..a82f06efb73018dd82b00f870ddd74ae8457311b 100644 (file)
--- a/test/suite.erl
+++ b/test/suite.erl
@@ -62,6 +62,7 @@ init_config(Config) ->
                       {s2s_port, 5269},
                       {component_port, 5270},
                       {web_port, 5280},
+                      {proxy_port, 7777},
                       {password, Password},
                       {mysql_server, <<"localhost">>},
                       {mysql_port, 3306},