Move client rest tests back under rest

This commit is contained in:
Mark Haines 2015-01-22 16:13:27 +00:00
parent 97c68c508d
commit 53584420a5
9 changed files with 19 additions and 5 deletions

View File

@ -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.

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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