summary refs log tree commit diff
path: root/tests/appservice/test_appservice.py
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <dawagner@gmail.com>2016-01-14 14:34:11 +0000
committerDaniel Wagner-Hall <dawagner@gmail.com>2016-01-14 14:34:11 +0000
commit2c760372d6ba23f96009f1d6ff08faf9402d1906 (patch)
tree5f14aaa4a07e93f283464717d34ed897062de72f /tests/appservice/test_appservice.py
parentMerge pull request #498 from matrix-org/push_rule_enabled_fix (diff)
parentRequire ID and as_token be unique for ASs (diff)
downloadsynapse-2c760372d6ba23f96009f1d6ff08faf9402d1906.tar.xz
Merge pull request #496 from matrix-org/daniel/3
Require ID and as_token be unique for ASs

Defaults ID to as_token if not specified. This will change
when IDs are fully supported.
Diffstat (limited to 'tests/appservice/test_appservice.py')
-rw-r--r--tests/appservice/test_appservice.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/appservice/test_appservice.py b/tests/appservice/test_appservice.py

index 191c420c4d..ef48bbc296 100644 --- a/tests/appservice/test_appservice.py +++ b/tests/appservice/test_appservice.py
@@ -29,6 +29,7 @@ class ApplicationServiceTestCase(unittest.TestCase): def setUp(self): self.service = ApplicationService( + id="unique_identifier", url="some_url", token="some_token", namespaces={