Allow configuring proxy65 port in tests

4 years ago · 6ca5691792
parent 0673b068e0
commit 6ca5691792
9 changed files with 15 additions and 6 deletions
--- 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!"
--- 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: []
--- 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
--- 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
--- 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: []
--- 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
--- 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
--- 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@@
--- 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},