Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2024-12-26 10:09:21 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3109 from NotAFile/py3-tests-fix

Browse Source 
Make tests py3 compatible
This commit is contained in:
Richard van der Hoff 2018-04-23 11:59:03 +01:00 committed by GitHub
commit 286e20f2bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/config/test_load.py
View File

@ -24,7 +24,7 @@ class ConfigLoadingTestCase(unittest.TestCase):
def setUp(self): def setUp(self):
self.dir = tempfile.mkdtemp() self.dir = tempfile.mkdtemp()
print self.dir print(self.dir)
self.file = os.path.join(self.dir, "homeserver.yaml") self.file = os.path.join(self.dir, "homeserver.yaml")
def tearDown(self): def tearDown(self):

2
tests/crypto/test_keyring.py
View File

@ -183,7 +183,7 @@ class KeyringTestCase(unittest.TestCase):
res_deferreds_2 = kr.verify_json_objects_for_server( res_deferreds_2 = kr.verify_json_objects_for_server(
[("server10", json1)], [("server10", json1)],
) )
yield async.sleep(01) yield async.sleep(1)
self.http_client.post_json.assert_not_called() self.http_client.post_json.assert_not_called()
res_deferreds_2[0].addBoth(self.check_context, None) res_deferreds_2[0].addBoth(self.check_context, None)

2
tests/test_distributor.py
View File

@ -62,7 +62,7 @@ class DistributorTestCase(unittest.TestCase):
def test_signal_catch(self): def test_signal_catch(self):
self.dist.declare("alarm") self.dist.declare("alarm")
observers = [Mock() for i in 1, 2] observers = [Mock() for i in (1, 2)]
for o in observers: for o in observers:
self.dist.observe("alarm", o) self.dist.observe("alarm", o)

2
tests/util/test_file_consumer.py
View File

@ -20,7 +20,7 @@ from mock import NonCallableMock
from synapse.util.file_consumer import BackgroundFileConsumer from synapse.util.file_consumer import BackgroundFileConsumer
from tests import unittest from tests import unittest
from StringIO import StringIO from six import StringIO
import threading import threading

3
tests/util/test_linearizer.py
View File

@ -18,6 +18,7 @@ from tests import unittest
from twisted.internet import defer from twisted.internet import defer
from synapse.util.async import Linearizer from synapse.util.async import Linearizer
from six.moves import range
class LinearizerTestCase(unittest.TestCase): class LinearizerTestCase(unittest.TestCase):
@ -58,7 +59,7 @@ class LinearizerTestCase(unittest.TestCase):
logcontext.LoggingContext.current_context(), lc) logcontext.LoggingContext.current_context(), lc)
func(0, sleep=True) func(0, sleep=True)
for i in xrange(1, 100): for i in range(1, 100):
func(i) func(i)
return func(1000) return func(1000)