Move client rest tests back under rest

9 files changed, 19 insertions, 5 deletions

diff --git a/tests/client/__init__.py b/tests/rest/__init__.py
index 1a84d94cd9..1a84d94cd9 100644
--- a/tests/client/__init__.py
+++ b/tests/rest/__init__.py
diff --git a/tests/rest/client/__init__.py b/tests/rest/client/__init__.py
new file mode 100644
index 0000000000..1a84d94cd9
--- /dev/null
+++ b/tests/rest/client/__init__.py
@@ -0,0 +1,14 @@
+# -*- coding: utf-8 -*-
+# Copyright 2015 OpenMarket Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
diff --git a/tests/client/v1/__init__.py b/tests/rest/client/v1/__init__.py
index 9bff9ec169..9bff9ec169 100644
--- a/tests/client/v1/__init__.py
+++ b/tests/rest/client/v1/__init__.py
diff --git a/tests/client/v1/test_events.py b/tests/rest/client/v1/test_events.py
index e914b05a52..0384ffbb3d 100644
--- a/tests/client/v1/test_events.py
+++ b/tests/rest/client/v1/test_events.py
@@ -25,7 +25,7 @@ import synapse.rest.client.v1.room
 
 from synapse.server import HomeServer
 
-from ...utils import MockHttpResource, SQLiteMemoryDbPool, MockKey
+from ....utils import MockHttpResource, SQLiteMemoryDbPool, MockKey
 from .utils import RestTestCase
 
 from mock import Mock, NonCallableMock
diff --git a/tests/client/v1/test_presence.py b/tests/rest/client/v1/test_presence.py
index e7d636c74d..0b6f7cfccb 100644
--- a/tests/client/v1/test_presence.py
+++ b/tests/rest/client/v1/test_presence.py
@@ -20,7 +20,7 @@ from twisted.internet import defer
 
 from mock import Mock
 
-from ...utils import MockHttpResource, MockKey
+from ....utils import MockHttpResource, MockKey
 
 from synapse.api.constants import PresenceState
 from synapse.handlers.presence import PresenceHandler
diff --git a/tests/client/v1/test_profile.py b/tests/rest/client/v1/test_profile.py
index 1182cc54eb..47cfb10a6d 100644
--- a/tests/client/v1/test_profile.py
+++ b/tests/rest/client/v1/test_profile.py
@@ -20,7 +20,7 @@ from twisted.internet import defer
 
 from mock import Mock, NonCallableMock
 
-from ...utils import MockHttpResource, MockKey
+from ....utils import MockHttpResource, MockKey
 
 from synapse.api.errors import SynapseError, AuthError
 from synapse.server import HomeServer
diff --git a/tests/client/v1/test_rooms.py b/tests/rest/client/v1/test_rooms.py
index 4d529ef007..12f8040541 100644
--- a/tests/client/v1/test_rooms.py
+++ b/tests/rest/client/v1/test_rooms.py
@@ -30,7 +30,7 @@ import json
 import urllib
 import types
 
-from ...utils import MockHttpResource, SQLiteMemoryDbPool, MockKey
+from ....utils import MockHttpResource, SQLiteMemoryDbPool, MockKey
 from .utils import RestTestCase
 
 from mock import Mock, NonCallableMock
diff --git a/tests/client/v1/test_typing.py b/tests/rest/client/v1/test_typing.py
index af3a9a6c1c..647bcebfd8 100644
--- a/tests/client/v1/test_typing.py
+++ b/tests/rest/client/v1/test_typing.py
@@ -21,7 +21,7 @@ from twisted.internet import defer
 import synapse.rest.client.v1.room
 from synapse.server import HomeServer
 
-from ...utils import MockHttpResource, MockClock, SQLiteMemoryDbPool, MockKey
+from ....utils import MockHttpResource, MockClock, SQLiteMemoryDbPool, MockKey
 from .utils import RestTestCase
 
 from mock import Mock, NonCallableMock
diff --git a/tests/client/v1/utils.py b/tests/rest/client/v1/utils.py
index 579441fb4a..579441fb4a 100644
--- a/tests/client/v1/utils.py
+++ b/tests/rest/client/v1/utils.py