mirror of
https://git.anonymousland.org/anonymousland/synapse.git
synced 2024-09-07 04:01:52 +00:00
Move client v1 api rest servlets into a "client/v1" directory
This commit is contained in:
parent
16bfabb9c5
commit
1d2016b4a8
14
synapse/client/__init__.py
Normal file
14
synapse/client/__init__.py
Normal 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.
|
@ -15,7 +15,7 @@
|
|||||||
|
|
||||||
""" This module contains base REST classes for constructing REST servlets. """
|
""" This module contains base REST classes for constructing REST servlets. """
|
||||||
from synapse.api.urls import CLIENT_PREFIX
|
from synapse.api.urls import CLIENT_PREFIX
|
||||||
from synapse.rest.transactions import HttpTransactionStore
|
from .transactions import HttpTransactionStore
|
||||||
import re
|
import re
|
||||||
|
|
||||||
import logging
|
import logging
|
@ -18,7 +18,7 @@ from twisted.internet import defer
|
|||||||
|
|
||||||
from synapse.api.errors import SynapseError
|
from synapse.api.errors import SynapseError
|
||||||
from synapse.streams.config import PaginationConfig
|
from synapse.streams.config import PaginationConfig
|
||||||
from synapse.rest.base import RestServlet, client_path_pattern
|
from .base import RestServlet, client_path_pattern
|
||||||
|
|
||||||
import logging
|
import logging
|
||||||
|
|
@ -24,7 +24,7 @@ from synapse.events.utils import serialize_event
|
|||||||
from synapse.notifier import Notifier
|
from synapse.notifier import Notifier
|
||||||
from synapse.api.auth import Auth
|
from synapse.api.auth import Auth
|
||||||
from synapse.handlers import Handlers
|
from synapse.handlers import Handlers
|
||||||
from synapse.rest import RestServletFactory
|
from synapse.client.v1 import RestServletFactory
|
||||||
from synapse.state import StateHandler
|
from synapse.state import StateHandler
|
||||||
from synapse.storage import DataStore
|
from synapse.storage import DataStore
|
||||||
from synapse.types import UserID, RoomAlias, RoomID, EventID
|
from synapse.types import UserID, RoomAlias, RoomID, EventID
|
||||||
|
14
tests/client/__init__.py
Normal file
14
tests/client/__init__.py
Normal 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.
|
@ -19,13 +19,13 @@ from tests import unittest
|
|||||||
# twisted imports
|
# twisted imports
|
||||||
from twisted.internet import defer
|
from twisted.internet import defer
|
||||||
|
|
||||||
import synapse.rest.events
|
import synapse.client.v1.events
|
||||||
import synapse.rest.register
|
import synapse.client.v1.register
|
||||||
import synapse.rest.room
|
import synapse.client.v1.room
|
||||||
|
|
||||||
from synapse.server import HomeServer
|
from synapse.server import HomeServer
|
||||||
|
|
||||||
from ..utils import MockHttpResource, SQLiteMemoryDbPool, MockKey
|
from ...utils import MockHttpResource, SQLiteMemoryDbPool, MockKey
|
||||||
from .utils import RestTestCase
|
from .utils import RestTestCase
|
||||||
|
|
||||||
from mock import Mock, NonCallableMock
|
from mock import Mock, NonCallableMock
|
||||||
@ -144,9 +144,9 @@ class EventStreamPermissionsTestCase(RestTestCase):
|
|||||||
hs.get_clock().time_msec.return_value = 1000000
|
hs.get_clock().time_msec.return_value = 1000000
|
||||||
hs.get_clock().time.return_value = 1000
|
hs.get_clock().time.return_value = 1000
|
||||||
|
|
||||||
synapse.rest.register.register_servlets(hs, self.mock_resource)
|
synapse.client.v1.register.register_servlets(hs, self.mock_resource)
|
||||||
synapse.rest.events.register_servlets(hs, self.mock_resource)
|
synapse.client.v1.events.register_servlets(hs, self.mock_resource)
|
||||||
synapse.rest.room.register_servlets(hs, self.mock_resource)
|
synapse.client.v1.room.register_servlets(hs, self.mock_resource)
|
||||||
|
|
||||||
# register an account
|
# register an account
|
||||||
self.user_id = "sid1"
|
self.user_id = "sid1"
|
@ -20,7 +20,7 @@ from twisted.internet import defer
|
|||||||
|
|
||||||
from mock import Mock
|
from mock import Mock
|
||||||
|
|
||||||
from ..utils import MockHttpResource, MockKey
|
from ...utils import MockHttpResource, MockKey
|
||||||
|
|
||||||
from synapse.api.constants import PresenceState
|
from synapse.api.constants import PresenceState
|
||||||
from synapse.handlers.presence import PresenceHandler
|
from synapse.handlers.presence import PresenceHandler
|
@ -20,7 +20,7 @@ from twisted.internet import defer
|
|||||||
|
|
||||||
from mock import Mock, NonCallableMock
|
from mock import Mock, NonCallableMock
|
||||||
|
|
||||||
from ..utils import MockHttpResource, MockKey
|
from ...utils import MockHttpResource, MockKey
|
||||||
|
|
||||||
from synapse.api.errors import SynapseError, AuthError
|
from synapse.api.errors import SynapseError, AuthError
|
||||||
from synapse.server import HomeServer
|
from synapse.server import HomeServer
|
@ -18,7 +18,7 @@
|
|||||||
# twisted imports
|
# twisted imports
|
||||||
from twisted.internet import defer
|
from twisted.internet import defer
|
||||||
|
|
||||||
import synapse.rest.room
|
import synapse.client.v1.room
|
||||||
from synapse.api.constants import Membership
|
from synapse.api.constants import Membership
|
||||||
|
|
||||||
from synapse.server import HomeServer
|
from synapse.server import HomeServer
|
||||||
@ -30,7 +30,7 @@ import json
|
|||||||
import urllib
|
import urllib
|
||||||
import types
|
import types
|
||||||
|
|
||||||
from ..utils import MockHttpResource, SQLiteMemoryDbPool, MockKey
|
from ...utils import MockHttpResource, SQLiteMemoryDbPool, MockKey
|
||||||
from .utils import RestTestCase
|
from .utils import RestTestCase
|
||||||
|
|
||||||
from mock import Mock, NonCallableMock
|
from mock import Mock, NonCallableMock
|
||||||
@ -82,7 +82,7 @@ class RoomPermissionsTestCase(RestTestCase):
|
|||||||
|
|
||||||
self.auth_user_id = self.rmcreator_id
|
self.auth_user_id = self.rmcreator_id
|
||||||
|
|
||||||
synapse.rest.room.register_servlets(hs, self.mock_resource)
|
synapse.client.v1.room.register_servlets(hs, self.mock_resource)
|
||||||
|
|
||||||
self.auth = hs.get_auth()
|
self.auth = hs.get_auth()
|
||||||
|
|
||||||
@ -476,7 +476,7 @@ class RoomsMemberListTestCase(RestTestCase):
|
|||||||
return defer.succeed(None)
|
return defer.succeed(None)
|
||||||
hs.get_datastore().insert_client_ip = _insert_client_ip
|
hs.get_datastore().insert_client_ip = _insert_client_ip
|
||||||
|
|
||||||
synapse.rest.room.register_servlets(hs, self.mock_resource)
|
synapse.client.v1.room.register_servlets(hs, self.mock_resource)
|
||||||
|
|
||||||
def tearDown(self):
|
def tearDown(self):
|
||||||
pass
|
pass
|
||||||
@ -565,7 +565,7 @@ class RoomsCreateTestCase(RestTestCase):
|
|||||||
return defer.succeed(None)
|
return defer.succeed(None)
|
||||||
hs.get_datastore().insert_client_ip = _insert_client_ip
|
hs.get_datastore().insert_client_ip = _insert_client_ip
|
||||||
|
|
||||||
synapse.rest.room.register_servlets(hs, self.mock_resource)
|
synapse.client.v1.room.register_servlets(hs, self.mock_resource)
|
||||||
|
|
||||||
def tearDown(self):
|
def tearDown(self):
|
||||||
pass
|
pass
|
||||||
@ -668,7 +668,7 @@ class RoomTopicTestCase(RestTestCase):
|
|||||||
return defer.succeed(None)
|
return defer.succeed(None)
|
||||||
hs.get_datastore().insert_client_ip = _insert_client_ip
|
hs.get_datastore().insert_client_ip = _insert_client_ip
|
||||||
|
|
||||||
synapse.rest.room.register_servlets(hs, self.mock_resource)
|
synapse.client.v1.room.register_servlets(hs, self.mock_resource)
|
||||||
|
|
||||||
# create the room
|
# create the room
|
||||||
self.room_id = yield self.create_room_as(self.user_id)
|
self.room_id = yield self.create_room_as(self.user_id)
|
||||||
@ -783,7 +783,7 @@ class RoomMemberStateTestCase(RestTestCase):
|
|||||||
return defer.succeed(None)
|
return defer.succeed(None)
|
||||||
hs.get_datastore().insert_client_ip = _insert_client_ip
|
hs.get_datastore().insert_client_ip = _insert_client_ip
|
||||||
|
|
||||||
synapse.rest.room.register_servlets(hs, self.mock_resource)
|
synapse.client.v1.room.register_servlets(hs, self.mock_resource)
|
||||||
|
|
||||||
self.room_id = yield self.create_room_as(self.user_id)
|
self.room_id = yield self.create_room_as(self.user_id)
|
||||||
|
|
||||||
@ -919,7 +919,7 @@ class RoomMessagesTestCase(RestTestCase):
|
|||||||
return defer.succeed(None)
|
return defer.succeed(None)
|
||||||
hs.get_datastore().insert_client_ip = _insert_client_ip
|
hs.get_datastore().insert_client_ip = _insert_client_ip
|
||||||
|
|
||||||
synapse.rest.room.register_servlets(hs, self.mock_resource)
|
synapse.client.v1.room.register_servlets(hs, self.mock_resource)
|
||||||
|
|
||||||
self.room_id = yield self.create_room_as(self.user_id)
|
self.room_id = yield self.create_room_as(self.user_id)
|
||||||
|
|
||||||
@ -1023,7 +1023,7 @@ class RoomInitialSyncTestCase(RestTestCase):
|
|||||||
return defer.succeed(None)
|
return defer.succeed(None)
|
||||||
hs.get_datastore().insert_client_ip = _insert_client_ip
|
hs.get_datastore().insert_client_ip = _insert_client_ip
|
||||||
|
|
||||||
synapse.rest.room.register_servlets(hs, self.mock_resource)
|
synapse.client.v1.room.register_servlets(hs, self.mock_resource)
|
||||||
|
|
||||||
# Since I'm getting my own presence I need to exist as far as presence
|
# Since I'm getting my own presence I need to exist as far as presence
|
||||||
# is concerned.
|
# is concerned.
|
@ -18,10 +18,10 @@
|
|||||||
# twisted imports
|
# twisted imports
|
||||||
from twisted.internet import defer
|
from twisted.internet import defer
|
||||||
|
|
||||||
import synapse.rest.room
|
import synapse.client.v1.room
|
||||||
from synapse.server import HomeServer
|
from synapse.server import HomeServer
|
||||||
|
|
||||||
from ..utils import MockHttpResource, MockClock, SQLiteMemoryDbPool, MockKey
|
from ...utils import MockHttpResource, MockClock, SQLiteMemoryDbPool, MockKey
|
||||||
from .utils import RestTestCase
|
from .utils import RestTestCase
|
||||||
|
|
||||||
from mock import Mock, NonCallableMock
|
from mock import Mock, NonCallableMock
|
||||||
@ -104,7 +104,7 @@ class RoomTypingTestCase(RestTestCase):
|
|||||||
hs.get_handlers().room_member_handler.fetch_room_distributions_into = (
|
hs.get_handlers().room_member_handler.fetch_room_distributions_into = (
|
||||||
fetch_room_distributions_into)
|
fetch_room_distributions_into)
|
||||||
|
|
||||||
synapse.rest.room.register_servlets(hs, self.mock_resource)
|
synapse.client.v1.room.register_servlets(hs, self.mock_resource)
|
||||||
|
|
||||||
self.room_id = yield self.create_room_as(self.user_id)
|
self.room_id = yield self.create_room_as(self.user_id)
|
||||||
# Need another user to make notifications actually work
|
# Need another user to make notifications actually work
|
Loading…
Reference in New Issue
Block a user