summary refs log tree commit diff
path: root/tests/api
diff options
context:
space:
mode:
authorAmber Brown <hawkowl@atleastfornow.net>2019-05-13 15:01:58 -0500
committerAmber Brown <hawkowl@atleastfornow.net>2019-05-13 15:01:58 -0500
commita1b8767da85794eb24e3b9fbce1aed87a04ea328 (patch)
treefd32dadee1bcd78d34de73c5398390c26a7cd974 /tests/api
parentMerge remote-tracking branch 'origin/develop' into shhs (diff)
parentMigrate all tests to use the dict-based config format instead of hanging item... (diff)
downloadsynapse-a1b8767da85794eb24e3b9fbce1aed87a04ea328.tar.xz
Merge remote-tracking branch 'origin/develop' into shhs
Diffstat (limited to 'tests/api')
-rw-r--r--tests/api/test_filtering.py1
-rw-r--r--tests/api/test_ratelimiting.py6
2 files changed, 3 insertions, 4 deletions
diff --git a/tests/api/test_filtering.py b/tests/api/test_filtering.py

index 2a7044801a..6ba623de13 100644 --- a/tests/api/test_filtering.py +++ b/tests/api/test_filtering.py
@@ -109,7 +109,6 @@ class FilteringTestCase(unittest.TestCase): "event_format": "client", "event_fields": ["type", "content", "sender"], }, - # a single backslash should be permitted (though it is debatable whether # it should be permitted before anything other than `.`, and what that # actually means) diff --git a/tests/api/test_ratelimiting.py b/tests/api/test_ratelimiting.py
index 30a255d441..dbdd427cac 100644 --- a/tests/api/test_ratelimiting.py +++ b/tests/api/test_ratelimiting.py
@@ -10,19 +10,19 @@ class TestRatelimiter(unittest.TestCase): key="test_id", time_now_s=0, rate_hz=0.1, burst_count=1 ) self.assertTrue(allowed) - self.assertEquals(10., time_allowed) + self.assertEquals(10.0, time_allowed) allowed, time_allowed = limiter.can_do_action( key="test_id", time_now_s=5, rate_hz=0.1, burst_count=1 ) self.assertFalse(allowed) - self.assertEquals(10., time_allowed) + self.assertEquals(10.0, time_allowed) allowed, time_allowed = limiter.can_do_action( key="test_id", time_now_s=10, rate_hz=0.1, burst_count=1 ) self.assertTrue(allowed) - self.assertEquals(20., time_allowed) + self.assertEquals(20.0, time_allowed) def test_pruning(self): limiter = Ratelimiter()