diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-10-13 10:58:36 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-10-13 10:58:50 +0100 |
| commit | 984e207b5982df26bec37223cd07b4044dcacdd2 (patch) | |
| tree | 9b7cd2052ab91b4365bb43f46d2509b389bf1bab /tests/federation | |
| parent | Merge branch 'develop' into server2server_signing (diff) | |
| parent | remove wishlist in favour of jira (diff) | |
| download | synapse-984e207b5982df26bec37223cd07b4044dcacdd2.tar.xz | |
Merge branch develop into server2server_signing
Conflicts: synapse/app/homeserver.py
Diffstat (limited to 'tests/federation')
| -rw-r--r-- | tests/federation/test_federation.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/federation/test_federation.py b/tests/federation/test_federation.py index c893c4863d..01f07ff36d 100644 --- a/tests/federation/test_federation.py +++ b/tests/federation/test_federation.py @@ -257,7 +257,7 @@ class FederationTestCase(unittest.TestCase): response = yield self.federation.make_query( destination="remote", query_type="a-question", - args={"one": "1", "two": "2"} + args={"one": "1", "two": "2"}, ) self.assertEquals({"your": "response"}, response) @@ -265,7 +265,8 @@ class FederationTestCase(unittest.TestCase): self.mock_http_client.get_json.assert_called_with( destination="remote", path="/_matrix/federation/v1/query/a-question", - args={"one": "1", "two": "2"} + args={"one": "1", "two": "2"}, + retry_on_dns_fail=True, ) @defer.inlineCallbacks |