summary refs log tree commit diff
diff options
context:
space:
mode:
authorPaul "LeoNerd" Evans <paul@matrix.org>2014-09-15 14:19:16 +0100
committerPaul "LeoNerd" Evans <paul@matrix.org>2014-09-15 14:19:16 +0100
commitae7dfeb5b6e8ee491f137d9a706cc83b9294b86f (patch)
tree4bf90c8ec06a7e4b70f785ed40cddb8345fab94a
parentMerge remote-tracking branch 'origin/develop' into test-sqlite-memory (diff)
downloadsynapse-ae7dfeb5b6e8ee491f137d9a706cc83b9294b86f.tar.xz
Use new 'tests.unittest' in new storage level tests
-rw-r--r--tests/storage/test_directory.py2
-rw-r--r--tests/storage/test_presence.py2
-rw-r--r--tests/storage/test_profile.py2
-rw-r--r--tests/storage/test_registration.py2
-rw-r--r--tests/storage/test_roommember.py2
5 files changed, 5 insertions, 5 deletions
diff --git a/tests/storage/test_directory.py b/tests/storage/test_directory.py
index c4c321dda6..9a80bf6c04 100644
--- a/tests/storage/test_directory.py
+++ b/tests/storage/test_directory.py
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 
-from twisted.trial import unittest
+from tests import unittest
 from twisted.internet import defer
 
 from synapse.server import HomeServer
diff --git a/tests/storage/test_presence.py b/tests/storage/test_presence.py
index f3fab4fe79..9655d3cf42 100644
--- a/tests/storage/test_presence.py
+++ b/tests/storage/test_presence.py
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 
-from twisted.trial import unittest
+from tests import unittest
 from twisted.internet import defer
 
 from synapse.server import HomeServer
diff --git a/tests/storage/test_profile.py b/tests/storage/test_profile.py
index 1855278044..21df2babdc 100644
--- a/tests/storage/test_profile.py
+++ b/tests/storage/test_profile.py
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 
-from twisted.trial import unittest
+from tests import unittest
 from twisted.internet import defer
 
 from synapse.server import HomeServer
diff --git a/tests/storage/test_registration.py b/tests/storage/test_registration.py
index 5e11ce3511..91e221d53e 100644
--- a/tests/storage/test_registration.py
+++ b/tests/storage/test_registration.py
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 
-from twisted.trial import unittest
+from tests import unittest
 from twisted.internet import defer
 
 from synapse.server import HomeServer
diff --git a/tests/storage/test_roommember.py b/tests/storage/test_roommember.py
index 5a6e93d4d1..dd18291b4c 100644
--- a/tests/storage/test_roommember.py
+++ b/tests/storage/test_roommember.py
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 
-from twisted.trial import unittest
+from tests import unittest
 from twisted.internet import defer
 
 from synapse.server import HomeServer