diff --git a/tests/storage/test_appservice.py b/tests/storage/test_appservice.py
index 2ad55c8462..77376b348e 100644
--- a/tests/storage/test_appservice.py
+++ b/tests/storage/test_appservice.py
@@ -15,71 +15,53 @@
from tests import unittest
from twisted.internet import defer
-from synapse.appservice import ApplicationService
-from synapse.storage.appservice import ApplicationServiceStore
-
from tests.utils import setup_test_homeserver
+from synapse.appservice import ApplicationService, ApplicationServiceState
+from synapse.server import HomeServer
+from synapse.storage.appservice import (
+ ApplicationServiceStore, ApplicationServiceTransactionStore
+)
+
+import json
+import os
+import yaml
+from mock import Mock
+from tests.utils import SQLiteMemoryDbPool, MockClock
class ApplicationServiceStoreTestCase(unittest.TestCase):
@defer.inlineCallbacks
def setUp(self):
- hs = yield setup_test_homeserver()
- db_pool = hs.get_db_pool()
+ self.as_yaml_files = []
+ config = Mock(
+ app_service_config_files=self.as_yaml_files
+ )
+ hs = yield setup_test_homeserver(config=config)
self.as_token = "token1"
- db_pool.runQuery(
- "INSERT INTO application_services(token) VALUES(?)",
- (self.as_token,)
- )
- db_pool.runQuery(
- "INSERT INTO application_services(token) VALUES(?)", ("token2",)
- )
- db_pool.runQuery(
- "INSERT INTO application_services(token) VALUES(?)", ("token3",)
- )
+ self.as_url = "some_url"
+ self._add_appservice(self.as_token, self.as_url, "some_hs_token", "bob")
+ self._add_appservice("token2", "some_url", "some_hs_token", "bob")
+ self._add_appservice("token3", "some_url", "some_hs_token", "bob")
# must be done after inserts
self.store = ApplicationServiceStore(hs)
- @defer.inlineCallbacks
- def test_update_and_retrieval_of_service(self):
- url = "https://matrix.org/appservices/foobar"
- hs_token = "hstok"
- user_regex = [
- {"regex": "@foobar_.*:matrix.org", "exclusive": True}
- ]
- alias_regex = [
- {"regex": "#foobar_.*:matrix.org", "exclusive": False}
- ]
- room_regex = [
+ def tearDown(self):
+ # TODO: suboptimal that we need to create files for tests!
+ for f in self.as_yaml_files:
+ try:
+ os.remove(f)
+ except:
+ pass
- ]
- service = ApplicationService(
- url=url, hs_token=hs_token, token=self.as_token, namespaces={
- ApplicationService.NS_USERS: user_regex,
- ApplicationService.NS_ALIASES: alias_regex,
- ApplicationService.NS_ROOMS: room_regex
- })
- yield self.store.update_app_service(service)
-
- stored_service = yield self.store.get_app_service_by_token(
- self.as_token
- )
- self.assertEquals(stored_service.token, self.as_token)
- self.assertEquals(stored_service.url, url)
- self.assertEquals(
- stored_service.namespaces[ApplicationService.NS_ALIASES],
- alias_regex
- )
- self.assertEquals(
- stored_service.namespaces[ApplicationService.NS_ROOMS],
- room_regex
- )
- self.assertEquals(
- stored_service.namespaces[ApplicationService.NS_USERS],
- user_regex
- )
+ def _add_appservice(self, as_token, url, hs_token, sender):
+ as_yaml = dict(url=url, as_token=as_token, hs_token=hs_token,
+ sender_localpart=sender, namespaces={})
+ # use the token as the filename
+ with open(as_token, 'w') as outfile:
+ outfile.write(yaml.dump(as_yaml))
+ self.as_yaml_files.append(as_token)
@defer.inlineCallbacks
def test_retrieve_unknown_service_token(self):
@@ -92,7 +74,7 @@ class ApplicationServiceStoreTestCase(unittest.TestCase):
self.as_token
)
self.assertEquals(stored_service.token, self.as_token)
- self.assertEquals(stored_service.url, None)
+ self.assertEquals(stored_service.url, self.as_url)
self.assertEquals(
stored_service.namespaces[ApplicationService.NS_ALIASES],
[]
@@ -110,3 +92,316 @@ class ApplicationServiceStoreTestCase(unittest.TestCase):
def test_retrieval_of_all_services(self):
services = yield self.store.get_app_services()
self.assertEquals(len(services), 3)
+
+
+class ApplicationServiceTransactionStoreTestCase(unittest.TestCase):
+
+ @defer.inlineCallbacks
+ def setUp(self):
+ self.as_yaml_files = []
+
+ config = Mock(
+ app_service_config_files=self.as_yaml_files
+ )
+ hs = yield setup_test_homeserver(config=config)
+ self.db_pool = hs.get_db_pool()
+
+ self.as_list = [
+ {
+ "token": "token1",
+ "url": "https://matrix-as.org",
+ "id": "token1"
+ },
+ {
+ "token": "alpha_tok",
+ "url": "https://alpha.com",
+ "id": "alpha_tok"
+ },
+ {
+ "token": "beta_tok",
+ "url": "https://beta.com",
+ "id": "beta_tok"
+ },
+ {
+ "token": "delta_tok",
+ "url": "https://delta.com",
+ "id": "delta_tok"
+ },
+ ]
+ for s in self.as_list:
+ yield self._add_service(s["url"], s["token"])
+
+ self.as_yaml_files = []
+
+ self.store = TestTransactionStore(hs)
+
+ def _add_service(self, url, as_token):
+ as_yaml = dict(url=url, as_token=as_token, hs_token="something",
+ sender_localpart="a_sender", namespaces={})
+ # use the token as the filename
+ with open(as_token, 'w') as outfile:
+ outfile.write(yaml.dump(as_yaml))
+ self.as_yaml_files.append(as_token)
+
+ def _set_state(self, id, state, txn=None):
+ return self.db_pool.runQuery(
+ "INSERT INTO application_services_state(as_id, state, last_txn) "
+ "VALUES(?,?,?)",
+ (id, state, txn)
+ )
+
+ def _insert_txn(self, as_id, txn_id, events):
+ return self.db_pool.runQuery(
+ "INSERT INTO application_services_txns(as_id, txn_id, event_ids) "
+ "VALUES(?,?,?)",
+ (as_id, txn_id, json.dumps([e.event_id for e in events]))
+ )
+
+ def _set_last_txn(self, as_id, txn_id):
+ return self.db_pool.runQuery(
+ "INSERT INTO application_services_state(as_id, last_txn, state) "
+ "VALUES(?,?,?)",
+ (as_id, txn_id, ApplicationServiceState.UP)
+ )
+
+ @defer.inlineCallbacks
+ def test_get_appservice_state_none(self):
+ service = Mock(id=999)
+ state = yield self.store.get_appservice_state(service)
+ self.assertEquals(None, state)
+
+ @defer.inlineCallbacks
+ def test_get_appservice_state_up(self):
+ yield self._set_state(
+ self.as_list[0]["id"], ApplicationServiceState.UP
+ )
+ service = Mock(id=self.as_list[0]["id"])
+ state = yield self.store.get_appservice_state(service)
+ self.assertEquals(ApplicationServiceState.UP, state)
+
+ @defer.inlineCallbacks
+ def test_get_appservice_state_down(self):
+ yield self._set_state(
+ self.as_list[0]["id"], ApplicationServiceState.UP
+ )
+ yield self._set_state(
+ self.as_list[1]["id"], ApplicationServiceState.DOWN
+ )
+ yield self._set_state(
+ self.as_list[2]["id"], ApplicationServiceState.DOWN
+ )
+ service = Mock(id=self.as_list[1]["id"])
+ state = yield self.store.get_appservice_state(service)
+ self.assertEquals(ApplicationServiceState.DOWN, state)
+
+ @defer.inlineCallbacks
+ def test_get_appservices_by_state_none(self):
+ services = yield self.store.get_appservices_by_state(
+ ApplicationServiceState.DOWN
+ )
+ self.assertEquals(0, len(services))
+
+ @defer.inlineCallbacks
+ def test_set_appservices_state_down(self):
+ service = Mock(id=self.as_list[1]["id"])
+ yield self.store.set_appservice_state(
+ service,
+ ApplicationServiceState.DOWN
+ )
+ rows = yield self.db_pool.runQuery(
+ "SELECT as_id FROM application_services_state WHERE state=?",
+ (ApplicationServiceState.DOWN,)
+ )
+ self.assertEquals(service.id, rows[0][0])
+
+ @defer.inlineCallbacks
+ def test_set_appservices_state_multiple_up(self):
+ service = Mock(id=self.as_list[1]["id"])
+ yield self.store.set_appservice_state(
+ service,
+ ApplicationServiceState.UP
+ )
+ yield self.store.set_appservice_state(
+ service,
+ ApplicationServiceState.DOWN
+ )
+ yield self.store.set_appservice_state(
+ service,
+ ApplicationServiceState.UP
+ )
+ rows = yield self.db_pool.runQuery(
+ "SELECT as_id FROM application_services_state WHERE state=?",
+ (ApplicationServiceState.UP,)
+ )
+ self.assertEquals(service.id, rows[0][0])
+
+ @defer.inlineCallbacks
+ def test_create_appservice_txn_first(self):
+ service = Mock(id=self.as_list[0]["id"])
+ events = [Mock(event_id="e1"), Mock(event_id="e2")]
+ txn = yield self.store.create_appservice_txn(service, events)
+ self.assertEquals(txn.id, 1)
+ self.assertEquals(txn.events, events)
+ self.assertEquals(txn.service, service)
+
+ @defer.inlineCallbacks
+ def test_create_appservice_txn_older_last_txn(self):
+ service = Mock(id=self.as_list[0]["id"])
+ events = [Mock(event_id="e1"), Mock(event_id="e2")]
+ yield self._set_last_txn(service.id, 9643) # AS is falling behind
+ yield self._insert_txn(service.id, 9644, events)
+ yield self._insert_txn(service.id, 9645, events)
+ txn = yield self.store.create_appservice_txn(service, events)
+ self.assertEquals(txn.id, 9646)
+ self.assertEquals(txn.events, events)
+ self.assertEquals(txn.service, service)
+
+ @defer.inlineCallbacks
+ def test_create_appservice_txn_up_to_date_last_txn(self):
+ service = Mock(id=self.as_list[0]["id"])
+ events = [Mock(event_id="e1"), Mock(event_id="e2")]
+ yield self._set_last_txn(service.id, 9643)
+ txn = yield self.store.create_appservice_txn(service, events)
+ self.assertEquals(txn.id, 9644)
+ self.assertEquals(txn.events, events)
+ self.assertEquals(txn.service, service)
+
+ @defer.inlineCallbacks
+ def test_create_appservice_txn_up_fuzzing(self):
+ service = Mock(id=self.as_list[0]["id"])
+ events = [Mock(event_id="e1"), Mock(event_id="e2")]
+ yield self._set_last_txn(service.id, 9643)
+
+ # dump in rows with higher IDs to make sure the queries aren't wrong.
+ yield self._set_last_txn(self.as_list[1]["id"], 119643)
+ yield self._set_last_txn(self.as_list[2]["id"], 9)
+ yield self._set_last_txn(self.as_list[3]["id"], 9643)
+ yield self._insert_txn(self.as_list[1]["id"], 119644, events)
+ yield self._insert_txn(self.as_list[1]["id"], 119645, events)
+ yield self._insert_txn(self.as_list[1]["id"], 119646, events)
+ yield self._insert_txn(self.as_list[2]["id"], 10, events)
+ yield self._insert_txn(self.as_list[3]["id"], 9643, events)
+
+ txn = yield self.store.create_appservice_txn(service, events)
+ self.assertEquals(txn.id, 9644)
+ self.assertEquals(txn.events, events)
+ self.assertEquals(txn.service, service)
+
+ @defer.inlineCallbacks
+ def test_complete_appservice_txn_first_txn(self):
+ service = Mock(id=self.as_list[0]["id"])
+ events = [Mock(event_id="e1"), Mock(event_id="e2")]
+ txn_id = 1
+
+ yield self._insert_txn(service.id, txn_id, events)
+ yield self.store.complete_appservice_txn(txn_id=txn_id, service=service)
+
+ res = yield self.db_pool.runQuery(
+ "SELECT last_txn FROM application_services_state WHERE as_id=?",
+ (service.id,)
+ )
+ self.assertEquals(1, len(res))
+ self.assertEquals(txn_id, res[0][0])
+
+ res = yield self.db_pool.runQuery(
+ "SELECT * FROM application_services_txns WHERE txn_id=?",
+ (txn_id,)
+ )
+ self.assertEquals(0, len(res))
+
+ @defer.inlineCallbacks
+ def test_complete_appservice_txn_existing_in_state_table(self):
+ service = Mock(id=self.as_list[0]["id"])
+ events = [Mock(event_id="e1"), Mock(event_id="e2")]
+ txn_id = 5
+ yield self._set_last_txn(service.id, 4)
+ yield self._insert_txn(service.id, txn_id, events)
+ yield self.store.complete_appservice_txn(txn_id=txn_id, service=service)
+
+ res = yield self.db_pool.runQuery(
+ "SELECT last_txn, state FROM application_services_state WHERE "
+ "as_id=?",
+ (service.id,)
+ )
+ self.assertEquals(1, len(res))
+ self.assertEquals(txn_id, res[0][0])
+ self.assertEquals(ApplicationServiceState.UP, res[0][1])
+
+ res = yield self.db_pool.runQuery(
+ "SELECT * FROM application_services_txns WHERE txn_id=?",
+ (txn_id,)
+ )
+ self.assertEquals(0, len(res))
+
+ @defer.inlineCallbacks
+ def test_get_oldest_unsent_txn_none(self):
+ service = Mock(id=self.as_list[0]["id"])
+
+ txn = yield self.store.get_oldest_unsent_txn(service)
+ self.assertEquals(None, txn)
+
+ @defer.inlineCallbacks
+ def test_get_oldest_unsent_txn(self):
+ service = Mock(id=self.as_list[0]["id"])
+ events = [Mock(event_id="e1"), Mock(event_id="e2")]
+ other_events = [Mock(event_id="e5"), Mock(event_id="e6")]
+
+ # we aren't testing store._base stuff here, so mock this out
+ self.store._get_events_txn = Mock(return_value=events)
+
+ yield self._insert_txn(self.as_list[1]["id"], 9, other_events)
+ yield self._insert_txn(service.id, 10, events)
+ yield self._insert_txn(service.id, 11, other_events)
+ yield self._insert_txn(service.id, 12, other_events)
+
+ txn = yield self.store.get_oldest_unsent_txn(service)
+ self.assertEquals(service, txn.service)
+ self.assertEquals(10, txn.id)
+ self.assertEquals(events, txn.events)
+
+ @defer.inlineCallbacks
+ def test_get_appservices_by_state_single(self):
+ yield self._set_state(
+ self.as_list[0]["id"], ApplicationServiceState.DOWN
+ )
+ yield self._set_state(
+ self.as_list[1]["id"], ApplicationServiceState.UP
+ )
+
+ services = yield self.store.get_appservices_by_state(
+ ApplicationServiceState.DOWN
+ )
+ self.assertEquals(1, len(services))
+ self.assertEquals(self.as_list[0]["id"], services[0].id)
+
+ @defer.inlineCallbacks
+ def test_get_appservices_by_state_multiple(self):
+ yield self._set_state(
+ self.as_list[0]["id"], ApplicationServiceState.DOWN
+ )
+ yield self._set_state(
+ self.as_list[1]["id"], ApplicationServiceState.UP
+ )
+ yield self._set_state(
+ self.as_list[2]["id"], ApplicationServiceState.DOWN
+ )
+ yield self._set_state(
+ self.as_list[3]["id"], ApplicationServiceState.UP
+ )
+
+ services = yield self.store.get_appservices_by_state(
+ ApplicationServiceState.DOWN
+ )
+ self.assertEquals(2, len(services))
+ self.assertEquals(
+ set([self.as_list[2]["id"], self.as_list[0]["id"]]),
+ set([services[0].id, services[1].id])
+ )
+
+
+# required for ApplicationServiceTransactionStoreTestCase tests
+class TestTransactionStore(ApplicationServiceTransactionStore,
+ ApplicationServiceStore):
+
+ def __init__(self, hs):
+ super(TestTransactionStore, self).__init__(hs)
|
