mirrors/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2024-12-19 01:21:09 +03:00
Code Issues Projects Releases Packages Wiki Activity

pep8 style fixes

Browse source
This commit is contained in:
Michael Kaye 2018-05-09 15:11:19 +01:00
parent 488ed3e444
commit 1e8cfc9e77
2 changed files with 44 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
synapse/rulecheck/domain_rule_checker.py
View file

@ -35,6 +35,8 @@ spam_checker:
Don't forget to consider if you can invite users from your own domain. Don't forget to consider if you can invite users from your own domain.
""" """
class DomainRuleChecker(object): class DomainRuleChecker(object):
def __init__(self, config): def __init__(self, config):

82
tests/rulecheck/test_domainrulecheck.py
View file

@ -24,73 +24,75 @@ class DomainRuleCheckerTestCase(unittest.TestCase):
def test_allowed(self): def test_allowed(self):
config = { config = {
"default": False, "default": False,
"domain_mapping": { "domain_mapping": {
"source_one": [ "target_one", "target_two" ], "source_one": ["target_one", "target_two"],
"source_two": [ "target_two" ] "source_two": ["target_two"]
} }
} }
check = DomainRuleChecker(config) check = DomainRuleChecker(config)
self.assertTrue(check.user_may_invite("test:source_one","test:target_one", "room")) self.assertTrue(check.user_may_invite("test:source_one",
self.assertTrue(check.user_may_invite("test:source_one","test:target_two", "room")) "test:target_one", "room"))
self.assertTrue(check.user_may_invite("test:source_two","test:target_two", "room")) self.assertTrue(check.user_may_invite("test:source_one",
"test:target_two", "room"))
self.assertTrue(check.user_may_invite("test:source_two",
"test:target_two", "room"))
def test_disallowed(self): def test_disallowed(self):
config = { config = {
"default": True, "default": True,
"domain_mapping": { "domain_mapping": {
"source_one": [ "target_one", "target_two" ], "source_one": ["target_one", "target_two"],
"source_two": [ "target_two" ] "source_two": ["target_two"]
} }
} }
check = DomainRuleChecker(config) check = DomainRuleChecker(config)
self.assertFalse(check.user_may_invite("test:source_one","test:target_three", "room")) self.assertFalse(check.user_may_invite("test:source_one",
self.assertFalse(check.user_may_invite("test:source_two","test:target_three", "room")) "test:target_three", "room"))
self.assertFalse(check.user_may_invite("test:source_two","test:target_one", "room")) self.assertFalse(check.user_may_invite("test:source_two",
"test:target_three", "room"))
self.assertFalse(check.user_may_invite("test:source_two",
"test:target_one", "room"))
def test_default_allow(self): def test_default_allow(self):
config = { config = {
"default": True, "default": True,
"domain_mapping": { "domain_mapping": {
"source_one": [ "target_one", "target_two" ], "source_one": ["target_one", "target_two"],
"source_two": [ "target_two" ] "source_two": ["target_two"]
} }
} }
check = DomainRuleChecker(config) check = DomainRuleChecker(config)
self.assertTrue(check.user_may_invite("test:source_three","test:target_one", "room")) self.assertTrue(check.user_may_invite("test:source_three",
"test:target_one", "room"))
def test_default_deny(self): def test_default_deny(self):
config = { config = {
"default": False, "default": False,
"domain_mapping": { "domain_mapping": {
"source_one": [ "target_one", "target_two" ], "source_one": ["target_one", "target_two"],
"source_two": [ "target_two" ] "source_two": ["target_two"]
} }
} }
check = DomainRuleChecker(config) check = DomainRuleChecker(config)
self.assertFalse(check.user_may_invite("test:source_three","test:target_one", "room")) self.assertFalse(check.user_may_invite("test:source_three",
"test:target_one", "room"))
def test_config_parse(self): def test_config_parse(self):
config = { config = {
"default": False, "default": False,
"domain_mapping": { "domain_mapping": {
"source_one": [ "target_one", "target_two" ], "source_one": ["target_one", "target_two"],
"source_two": [ "target_two" ] "source_two": ["target_two"]
} }
} }
self.assertEquals(config, DomainRuleChecker.parse_config(config)) self.assertEquals(config, DomainRuleChecker.parse_config(config))
def test_config_parse_failure(self): def test_config_parse_failure(self):
config = { config = {
"domain_mapping": { "domain_mapping": {
"source_one": [ "target_one", "target_two" ], "source_one": ["target_one", "target_two"],
"source_two": [ "target_two" ] "source_two": ["target_two"]
} }
} }
self.assertRaises(ConfigError, DomainRuleChecker.parse_config, config) self.assertRaises(ConfigError, DomainRuleChecker.parse_config, config)