summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDuco van Amstel <duco.vanamstel@gmail.com>2018-10-12 23:47:18 +0100
committerWim <wim@42.be>2018-10-13 00:47:18 +0200
commit3dd4ec57ff0d9503d10c15944c4704cc6620c552 (patch)
treee6bc6b76b8e2b0fb9fd6d516b1f3f4345d647523
parente15b0e04b891a4181119dc7ddd1846ba4f4450d6 (diff)
downloadmatterbridge-msglm-3dd4ec57ff0d9503d10c15944c4704cc6620c552.tar.gz
matterbridge-msglm-3dd4ec57ff0d9503d10c15944c4704cc6620c552.tar.bz2
matterbridge-msglm-3dd4ec57ff0d9503d10c15944c4704cc6620c552.zip
Fix race in gateway test. (#520)
-rw-r--r--gateway/gateway_test.go161
1 files changed, 132 insertions, 29 deletions
diff --git a/gateway/gateway_test.go b/gateway/gateway_test.go
index bf9461c7..0a1470ff 100644
--- a/gateway/gateway_test.go
+++ b/gateway/gateway_test.go
@@ -172,18 +172,27 @@ func TestNewRouter(t *testing.T) {
assert.Equal(t, 3, len(r.Gateways["bridge2"].Bridges))
assert.Equal(t, 4, len(r.Gateways["bridge1"].Channels))
assert.Equal(t, 3, len(r.Gateways["bridge2"].Channels))
- assert.Equal(t, &config.ChannelInfo{Name: "42wim/testroom", Direction: "out",
- ID: "42wim/testroomgitter.42wim", Account: "gitter.42wim",
- SameChannel: map[string]bool{"bridge2": false}},
- r.Gateways["bridge2"].Channels["42wim/testroomgitter.42wim"])
- assert.Equal(t, &config.ChannelInfo{Name: "42wim/testroom", Direction: "in",
- ID: "42wim/testroomgitter.42wim", Account: "gitter.42wim",
- SameChannel: map[string]bool{"bridge1": false}},
- r.Gateways["bridge1"].Channels["42wim/testroomgitter.42wim"])
- assert.Equal(t, &config.ChannelInfo{Name: "general", Direction: "inout",
- ID: "generaldiscord.test", Account: "discord.test",
- SameChannel: map[string]bool{"bridge1": false}},
- r.Gateways["bridge1"].Channels["generaldiscord.test"])
+ assert.Equal(t, &config.ChannelInfo{
+ Name: "42wim/testroom",
+ Direction: "out",
+ ID: "42wim/testroomgitter.42wim",
+ Account: "gitter.42wim",
+ SameChannel: map[string]bool{"bridge2": false},
+ }, r.Gateways["bridge2"].Channels["42wim/testroomgitter.42wim"])
+ assert.Equal(t, &config.ChannelInfo{
+ Name: "42wim/testroom",
+ Direction: "in",
+ ID: "42wim/testroomgitter.42wim",
+ Account: "gitter.42wim",
+ SameChannel: map[string]bool{"bridge1": false},
+ }, r.Gateways["bridge1"].Channels["42wim/testroomgitter.42wim"])
+ assert.Equal(t, &config.ChannelInfo{
+ Name: "general",
+ Direction: "inout",
+ ID: "generaldiscord.test",
+ Account: "discord.test",
+ SameChannel: map[string]bool{"bridge1": false},
+ }, r.Gateways["bridge1"].Channels["generaldiscord.test"])
}
func TestGetDestChannel(t *testing.T) {
@@ -192,11 +201,23 @@ func TestGetDestChannel(t *testing.T) {
for _, br := range r.Gateways["bridge1"].Bridges {
switch br.Account {
case "discord.test":
- assert.Equal(t, []config.ChannelInfo{{Name: "general", Account: "discord.test", Direction: "inout", ID: "generaldiscord.test", SameChannel: map[string]bool{"bridge1": false}, Options: config.ChannelOptions{Key: ""}}},
- r.Gateways["bridge1"].getDestChannel(msg, *br))
+ assert.Equal(t, []config.ChannelInfo{{
+ Name: "general",
+ Account: "discord.test",
+ Direction: "inout",
+ ID: "generaldiscord.test",
+ SameChannel: map[string]bool{"bridge1": false},
+ Options: config.ChannelOptions{Key: ""},
+ }}, r.Gateways["bridge1"].getDestChannel(msg, *br))
case "slack.test":
- assert.Equal(t, []config.ChannelInfo{{Name: "testing", Account: "slack.test", Direction: "out", ID: "testingslack.test", SameChannel: map[string]bool{"bridge1": false}, Options: config.ChannelOptions{Key: ""}}},
- r.Gateways["bridge1"].getDestChannel(msg, *br))
+ assert.Equal(t, []config.ChannelInfo{{
+ Name: "testing",
+ Account: "slack.test",
+ Direction: "out",
+ ID: "testingslack.test",
+ SameChannel: map[string]bool{"bridge1": false},
+ Options: config.ChannelOptions{Key: ""},
+ }}, r.Gateways["bridge1"].getDestChannel(msg, *br))
case "gitter.42wim":
assert.Equal(t, []config.ChannelInfo(nil), r.Gateways["bridge1"].getDestChannel(msg, *br))
case "irc.freenode":
@@ -226,35 +247,87 @@ func TestGetDestChannelAdvanced(t *testing.T) {
}
switch gw.Name {
case "bridge":
- if (msg.Channel == "#main" || msg.Channel == "-1111111111111" || msg.Channel == "irc") && (msg.Account == "irc.zzz" || msg.Account == "telegram.zzz" || msg.Account == "slack.zzz") {
+ if (msg.Channel == "#main" || msg.Channel == "-1111111111111" || msg.Channel == "irc") &&
+ (msg.Account == "irc.zzz" || msg.Account == "telegram.zzz" || msg.Account == "slack.zzz") {
hits[gw.Name]++
switch br.Account {
case "irc.zzz":
- assert.Equal(t, []config.ChannelInfo{{Name: "#main", Account: "irc.zzz", Direction: "inout", ID: "#mainirc.zzz", SameChannel: map[string]bool{"bridge": false}, Options: config.ChannelOptions{Key: ""}}}, channels)
+ assert.Equal(t, []config.ChannelInfo{{
+ Name: "#main",
+ Account: "irc.zzz",
+ Direction: "inout",
+ ID: "#mainirc.zzz",
+ SameChannel: map[string]bool{"bridge": false},
+ Options: config.ChannelOptions{Key: ""},
+ }}, channels)
case "telegram.zzz":
- assert.Equal(t, []config.ChannelInfo{{Name: "-1111111111111", Account: "telegram.zzz", Direction: "inout", ID: "-1111111111111telegram.zzz", SameChannel: map[string]bool{"bridge": false}, Options: config.ChannelOptions{Key: ""}}}, channels)
+ assert.Equal(t, []config.ChannelInfo{{
+ Name: "-1111111111111",
+ Account: "telegram.zzz",
+ Direction: "inout",
+ ID: "-1111111111111telegram.zzz",
+ SameChannel: map[string]bool{"bridge": false},
+ Options: config.ChannelOptions{Key: ""},
+ }}, channels)
case "slack.zzz":
- assert.Equal(t, []config.ChannelInfo{{Name: "irc", Account: "slack.zzz", Direction: "inout", ID: "ircslack.zzz", SameChannel: map[string]bool{"bridge": false}, Options: config.ChannelOptions{Key: ""}}}, channels)
+ assert.Equal(t, []config.ChannelInfo{{
+ Name: "irc",
+ Account: "slack.zzz",
+ Direction: "inout",
+ ID: "ircslack.zzz",
+ SameChannel: map[string]bool{"bridge": false},
+ Options: config.ChannelOptions{Key: ""},
+ }}, channels)
}
}
case "bridge2":
- if (msg.Channel == "#main-help" || msg.Channel == "--444444444444") && (msg.Account == "irc.zzz" || msg.Account == "telegram.zzz") {
+ if (msg.Channel == "#main-help" || msg.Channel == "--444444444444") &&
+ (msg.Account == "irc.zzz" || msg.Account == "telegram.zzz") {
hits[gw.Name]++
switch br.Account {
case "irc.zzz":
- assert.Equal(t, []config.ChannelInfo{{Name: "#main-help", Account: "irc.zzz", Direction: "inout", ID: "#main-helpirc.zzz", SameChannel: map[string]bool{"bridge2": false}, Options: config.ChannelOptions{Key: ""}}}, channels)
+ assert.Equal(t, []config.ChannelInfo{{
+ Name: "#main-help",
+ Account: "irc.zzz",
+ Direction: "inout",
+ ID: "#main-helpirc.zzz",
+ SameChannel: map[string]bool{"bridge2": false},
+ Options: config.ChannelOptions{Key: ""},
+ }}, channels)
case "telegram.zzz":
- assert.Equal(t, []config.ChannelInfo{{Name: "--444444444444", Account: "telegram.zzz", Direction: "inout", ID: "--444444444444telegram.zzz", SameChannel: map[string]bool{"bridge2": false}, Options: config.ChannelOptions{Key: ""}}}, channels)
+ assert.Equal(t, []config.ChannelInfo{{
+ Name: "--444444444444",
+ Account: "telegram.zzz",
+ Direction: "inout",
+ ID: "--444444444444telegram.zzz",
+ SameChannel: map[string]bool{"bridge2": false},
+ Options: config.ChannelOptions{Key: ""},
+ }}, channels)
}
}
case "bridge3":
- if (msg.Channel == "#main-telegram" || msg.Channel == "--333333333333") && (msg.Account == "irc.zzz" || msg.Account == "telegram.zzz") {
+ if (msg.Channel == "#main-telegram" || msg.Channel == "--333333333333") &&
+ (msg.Account == "irc.zzz" || msg.Account == "telegram.zzz") {
hits[gw.Name]++
switch br.Account {
case "irc.zzz":
- assert.Equal(t, []config.ChannelInfo{{Name: "#main-telegram", Account: "irc.zzz", Direction: "inout", ID: "#main-telegramirc.zzz", SameChannel: map[string]bool{"bridge3": false}, Options: config.ChannelOptions{Key: ""}}}, channels)
+ assert.Equal(t, []config.ChannelInfo{{
+ Name: "#main-telegram",
+ Account: "irc.zzz",
+ Direction: "inout",
+ ID: "#main-telegramirc.zzz",
+ SameChannel: map[string]bool{"bridge3": false},
+ Options: config.ChannelOptions{Key: ""},
+ }}, channels)
case "telegram.zzz":
- assert.Equal(t, []config.ChannelInfo{{Name: "--333333333333", Account: "telegram.zzz", Direction: "inout", ID: "--333333333333telegram.zzz", SameChannel: map[string]bool{"bridge3": false}, Options: config.ChannelOptions{Key: ""}}}, channels)
+ assert.Equal(t, []config.ChannelInfo{{
+ Name: "--333333333333",
+ Account: "telegram.zzz",
+ Direction: "inout",
+ ID: "--333333333333telegram.zzz",
+ SameChannel: map[string]bool{"bridge3": false},
+ Options: config.ChannelOptions{Key: ""},
+ }}, channels)
}
}
case "announcements":
@@ -265,11 +338,41 @@ func TestGetDestChannelAdvanced(t *testing.T) {
hits[gw.Name]++
switch br.Account {
case "irc.zzz":
- assert.Equal(t, []config.ChannelInfo{{Name: "#main", Account: "irc.zzz", Direction: "out", ID: "#mainirc.zzz", SameChannel: map[string]bool{"announcements": false}, Options: config.ChannelOptions{Key: ""}}, {Name: "#main-help", Account: "irc.zzz", Direction: "out", ID: "#main-helpirc.zzz", SameChannel: map[string]bool{"announcements": false}, Options: config.ChannelOptions{Key: ""}}}, channels)
+ assert.Len(t, channels, 2)
+ assert.Contains(t, channels, config.ChannelInfo{
+ Name: "#main",
+ Account: "irc.zzz",
+ Direction: "out",
+ ID: "#mainirc.zzz",
+ SameChannel: map[string]bool{"announcements": false},
+ Options: config.ChannelOptions{Key: ""},
+ })
+ assert.Contains(t, channels, config.ChannelInfo{
+ Name: "#main-help",
+ Account: "irc.zzz",
+ Direction: "out",
+ ID: "#main-helpirc.zzz",
+ SameChannel: map[string]bool{"announcements": false},
+ Options: config.ChannelOptions{Key: ""},
+ })
case "slack.zzz":
- assert.Equal(t, []config.ChannelInfo{{Name: "general", Account: "slack.zzz", Direction: "out", ID: "generalslack.zzz", SameChannel: map[string]bool{"announcements": false}, Options: config.ChannelOptions{Key: ""}}}, channels)
+ assert.Equal(t, []config.ChannelInfo{{
+ Name: "general",
+ Account: "slack.zzz",
+ Direction: "out",
+ ID: "generalslack.zzz",
+ SameChannel: map[string]bool{"announcements": false},
+ Options: config.ChannelOptions{Key: ""},
+ }}, channels)
case "telegram.zzz":
- assert.Equal(t, []config.ChannelInfo{{Name: "--333333333333", Account: "telegram.zzz", Direction: "out", ID: "--333333333333telegram.zzz", SameChannel: map[string]bool{"announcements": false}, Options: config.ChannelOptions{Key: ""}}}, channels)
+ assert.Equal(t, []config.ChannelInfo{{
+ Name: "--333333333333",
+ Account: "telegram.zzz",
+ Direction: "out",
+ ID: "--333333333333telegram.zzz",
+ SameChannel: map[string]bool{"announcements": false},
+ Options: config.ChannelOptions{Key: ""},
+ }}, channels)
}
}
}