From 164798ec32a30e07bd5972ec216e7848f0928c78 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Thu, 21 Mar 2019 12:25:33 +0000 Subject: Add 3PID invite support to spam checker --- tests/rulecheck/test_domainrulecheck.py | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'tests') diff --git a/tests/rulecheck/test_domainrulecheck.py b/tests/rulecheck/test_domainrulecheck.py index a887249b59..9c9f080f97 100644 --- a/tests/rulecheck/test_domainrulecheck.py +++ b/tests/rulecheck/test_domainrulecheck.py @@ -35,13 +35,15 @@ class DomainRuleCheckerTestCase(unittest.TestCase): } check = DomainRuleChecker(config) self.assertTrue( - check.user_may_invite("test:source_one", "test:target_one", "room", False) + check.user_may_invite( + "test:source_one", "test:target_one", None, "room", False, + ) ) self.assertTrue( - check.user_may_invite("test:source_one", "test:target_two", "room", False) + check.user_may_invite("test:source_one", "test:target_two", None, "room", False) ) self.assertTrue( - check.user_may_invite("test:source_two", "test:target_two", "room", False) + check.user_may_invite("test:source_two", "test:target_two", None, "room", False) ) def test_disallowed(self): @@ -55,16 +57,16 @@ class DomainRuleCheckerTestCase(unittest.TestCase): } check = DomainRuleChecker(config) self.assertFalse( - check.user_may_invite("test:source_one", "test:target_three", "room", False) + check.user_may_invite("test:source_one", "test:target_three", None, "room", False) ) self.assertFalse( - check.user_may_invite("test:source_two", "test:target_three", "room", False) + check.user_may_invite("test:source_two", "test:target_three", None, "room", False) ) self.assertFalse( - check.user_may_invite("test:source_two", "test:target_one", "room", False) + check.user_may_invite("test:source_two", "test:target_one", None, "room", False) ) self.assertFalse( - check.user_may_invite("test:source_four", "test:target_one", "room", False) + check.user_may_invite("test:source_four", "test:target_one", None, "room", False) ) def test_default_allow(self): @@ -77,7 +79,7 @@ class DomainRuleCheckerTestCase(unittest.TestCase): } check = DomainRuleChecker(config) self.assertTrue( - check.user_may_invite("test:source_three", "test:target_one", "room", False) + check.user_may_invite("test:source_three", "test:target_one", None, "room", False) ) def test_default_deny(self): @@ -90,7 +92,7 @@ class DomainRuleCheckerTestCase(unittest.TestCase): } check = DomainRuleChecker(config) self.assertFalse( - check.user_may_invite("test:source_three", "test:target_one", "room", False) + check.user_may_invite("test:source_three", "test:target_one", None, "room", False) ) def test_config_parse(self): -- cgit 1.5.1