diff options
| author | Paweł Chmielowski <pchmielowski@process-one.net> | 2019-10-01 17:00:50 +0200 |
|---|---|---|
| committer | Paweł Chmielowski <pchmielowski@process-one.net> | 2019-10-01 17:00:50 +0200 |
| commit | 6ca56917923fe9ac2b582ae2b7afc7d7874fb8c0 (patch) | |
| tree | 0d196121a12ac731f0625c5b38c9112e3c36de9c /test | |
| parent | Bump version of jose to 1.9.0 (diff) | |
Allow configuring proxy65 port in tests
Diffstat (limited to 'test')
| -rw-r--r-- | test/ejabberd_SUITE_data/ejabberd.ldap.yml | 3 | ||||
| -rw-r--r-- | test/ejabberd_SUITE_data/ejabberd.mnesia.yml | 3 | ||||
| -rw-r--r-- | test/ejabberd_SUITE_data/ejabberd.mysql.yml | 3 | ||||
| -rw-r--r-- | test/ejabberd_SUITE_data/ejabberd.pgsql.yml | 3 | ||||
| -rw-r--r-- | test/ejabberd_SUITE_data/ejabberd.redis.yml | 3 | ||||
| -rw-r--r-- | test/ejabberd_SUITE_data/ejabberd.sqlite.yml | 3 | ||||
| -rw-r--r-- | test/ejabberd_SUITE_data/ejabberd.yml | 1 | ||||
| -rw-r--r-- | test/ejabberd_SUITE_data/macros.yml | 1 | ||||
| -rw-r--r-- | test/suite.erl | 1 |
9 files changed, 15 insertions, 6 deletions
diff --git a/test/ejabberd_SUITE_data/ejabberd.ldap.yml b/test/ejabberd_SUITE_data/ejabberd.ldap.yml index 5c481cbc..a60d227d 100644 --- 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 bb57d085..14bb2bff 100644 --- 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 eb81c6c3..41190197 100644 --- 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 d7d43c9c..c0cd0b0d 100644 --- 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 5988c5b4..7065f0ff 100644 --- 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 9efaf216..3e22f6a2 100644 --- 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 2bf090d5..cea93fe9 100644 --- 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 047d363e..fdd46758 100644 --- 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 7c565eac..a82f06ef 100644 --- 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}, |