summary refs log tree commit diff
path: root/tests/config/test_load.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-04-27 12:54:43 +0100
committerRichard van der Hoff <richard@matrix.org>2018-04-27 12:54:43 +0100
commit3d1ae6139918ecb013c576a5eb0ed8e06103ebf6 (patch)
tree5056d9455cb6a0d72da1dc2b5dcf1a98c6282c6e /tests/config/test_load.py
parentBackport deferred.addTimeout (diff)
parentMerge pull request #3134 from matrix-org/erikj/fix_admin_media_api (diff)
downloadsynapse-3d1ae6139918ecb013c576a5eb0ed8e06103ebf6.tar.xz
Merge branch 'develop' into rav/deferred_timeout
Diffstat (limited to 'tests/config/test_load.py')
-rw-r--r--tests/config/test_load.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/config/test_load.py b/tests/config/test_load.py

index 161a87d7e3..772afd2cf9 100644 --- a/tests/config/test_load.py +++ b/tests/config/test_load.py
@@ -24,7 +24,7 @@ class ConfigLoadingTestCase(unittest.TestCase): def setUp(self): self.dir = tempfile.mkdtemp() - print self.dir + print(self.dir) self.file = os.path.join(self.dir, "homeserver.yaml") def tearDown(self):