Dedicate fed1 node for s2s tests #1736
Conversation
Can you elaborate? FWIW, I reused fed1 for global distribution because the pain of testing increases nonlinearly with the number of nodes (esp. for local tests). |
arcusfelis
force-pushed
the
reg1-node
branch
from
3debe4d
to
d27e663
Compare
|
@kzemek sure, that PR has additional tests for MUC over s2s. This lovely group of tests uses s2s https://github.com/esl/MongooseIM/pull/1311/files#r117275074 |
|
But overall, any XMPP interaction should work over s2s. |
|
yeah, a bit too many nodes :) |
arcusfelis
force-pushed
the
reg1-node
branch
from
d27e663
to
276f0b7
Compare
rel/reg1.vars.config
Outdated
| %% This node is for global distribution testing. | ||
| %% reg is short for region. | ||
| %% "localhost" host should be defined. | ||
| {hosts, "[ \"reg1\", \"localhost\" ]"}. |
There was a problem hiding this comment.
"reg1" domain not needed
There was a problem hiding this comment.
The funny thing is that tests want this host, otherwise they would fail with reason:
"reg1 is not a member of the host list".
There was a problem hiding this comment.
It's not funny. Every host in GD setup needs both global domain and local domain.
arcusfelis
force-pushed
the
reg1-node
branch
from
d105008
to
276f0b7
Compare
| @@ -96,13 +96,13 @@ init_per_suite(Config0) -> | |||
|
|
|||
| Config1 = [{s2s_opts, S2S} | escalus:init_per_suite(Config0)], | |||
| Config2 = [{escalus_user_db, xmpp} | Config1], | |||
| escalus:create_users(Config2, escalus:get_users([alice2, alice_bis, bob])). | |||
| escalus:create_users(Config2, escalus:get_users([alice2, alice, bob])). | |||
There was a problem hiding this comment.
What is the reason behind these changes?
There was a problem hiding this comment.
Reverts s2s_SUITE back before 85cc372#diff-b7f4c309c3aa8e798c16028cd03d1e3e.
In that commit, alice was replaced with alice_bis, because it's was not possible to use alice in s2s.
I've reverted it back, because we use alice everywhere else.
Separate s2s and global distribution test nodes. Global distribution tests should use new node reg1 (region 1) localhost should not be loaded on fed1, because it would make any additional s2s tests hard to implement. An example of such test is muc and s2s combination. Remove debug printing to console from mod_global_distrib_SUITE. Use generic rpc function provided by escalus from mod_global_distrib_SUITE. Update docs.
arcusfelis
force-pushed
the
reg1-node
branch
from
276f0b7
to
fd16ac4
Compare
|
@fenek ok, I've updated "header" of reg1.vars.config, so we would not remove some of the hosts, trying to "optimize" stuff :) |
|
@arcusfelis |
Separate s2s and global distribution test nodes.
Global distribution tests should use new node reg1 (region 1)
localhost should not be loaded on fed1, because it would make
any additional s2s tests hard to implement.
An example of such test is muc and s2s combination.
Remove debug printing to console from mod_global_distrib_SUITE.
Use generic rpc function provided by escalus from mod_global_distrib_SUITE.
Update docs.
This PR addresses "I can't merge #1311" without this patch.