summary refs log tree commit diff
path: root/tests/test_server.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-10-19 18:35:07 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2020-10-19 18:35:07 +0100
commit1e9ec2afff8197f8da833bb0c218aa31747471c0 (patch)
tree6e06996ab0f5fc06ab1e159fe938350455d3e0a0 /tests/test_server.py
parentMerge commit '8b6c176ae' into anoa/dinsic_release_1_21_x (diff)
parentFix the return type of send_nonmember_events. (#8112) (diff)
downloadsynapse-1e9ec2afff8197f8da833bb0c218aa31747471c0.tar.xz
Merge commit '3c01724b3' into anoa/dinsic_release_1_21_x
* commit '3c01724b3':
  Fix the return type of send_nonmember_events. (#8112)
  Remove : from allowed client_secret chars (#8101)
  Rename changelog from bugfix to misc.
  Iteratively encode JSON responses to avoid blocking the reactor. (#8013)
  Return the previous stream token if a non-member event is a duplicate. (#8093)
Diffstat (limited to 'tests/test_server.py')
-rw-r--r--tests/test_server.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/tests/test_server.py b/tests/test_server.py

index d628070e48..655c918a15 100644 --- a/tests/test_server.py +++ b/tests/test_server.py
@@ -178,7 +178,6 @@ class JsonResourceTests(unittest.TestCase): self.assertEqual(channel.result["code"], b"200") self.assertNotIn("body", channel.result) - self.assertEqual(channel.headers.getRawHeaders(b"Content-Length"), [b"15"]) class OptionsResourceTests(unittest.TestCase):