Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/processone/ejabberd.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorPaweł Chmielowski <pchmielowski@process-one.net>2015-04-20 17:16:30 +0300
committerPaweł Chmielowski <pchmielowski@process-one.net>2015-04-20 17:16:30 +0300
commite8576c23c53337af9a5fde8f66866da0923af9d0 (patch)
treefd81d00d3c06018132610c91422473cab64d2318 /test
parentc2e6ce0f0467965e645def11e714120f01a28002 (diff)
Make s2s port configurable in test runner
Diffstat (limited to 'test')
-rw-r--r--test/ejabberd_SUITE_data/ejabberd.yml2
-rw-r--r--test/suite.erl1
2 files changed, 2 insertions, 1 deletions
diff --git a/test/ejabberd_SUITE_data/ejabberd.yml b/test/ejabberd_SUITE_data/ejabberd.yml
index 58f90c802..c19e22441 100644
--- a/test/ejabberd_SUITE_data/ejabberd.yml
+++ b/test/ejabberd_SUITE_data/ejabberd.yml
@@ -340,7 +340,7 @@ listen:
shaper: c2s_shaper
access: c2s
-
- port: 5269
+ port: @@s2s_port@@
module: ejabberd_s2s_in
-
port: @@web_port@@
diff --git a/test/suite.erl b/test/suite.erl
index 3b5d402c8..fd5e175ea 100644
--- a/test/suite.erl
+++ b/test/suite.erl
@@ -31,6 +31,7 @@ init_config(Config) ->
{ok, CfgContentTpl} = file:read_file(ConfigPathTpl),
CfgContent = process_config_tpl(CfgContentTpl, [
{c2s_port, 5222},
+ {s2s_port, 5269},
{web_port, 5280},
{mysql_server, <<"localhost">>},
{mysql_port, 3306},