summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-04-10 11:33:27 +0100
committerErik Johnston <erik@matrix.org>2018-04-10 11:34:50 +0100
commit80a22daf603accf8de8d8c1dd69ecbbc3f2a59fe (patch)
treea4434bbcbb0895297d30a09c8fc142ecb8db0d25
parentEnsure slashes are escaped (diff)
downloadsynapse-github/erikj/urlencode_paths.tar.xz
Add some tests for federation url encoding github/erikj/urlencode_paths erikj/urlencode_paths
-rw-r--r--tests/federation/__init__.py14
-rw-r--r--tests/federation/transport/__init__.py14
-rw-r--r--tests/federation/transport/test_client.py30
3 files changed, 58 insertions, 0 deletions
diff --git a/tests/federation/__init__.py b/tests/federation/__init__.py
new file mode 100644
index 0000000000..a354d38ca8
--- /dev/null
+++ b/tests/federation/__init__.py
@@ -0,0 +1,14 @@
+# -*- coding: utf-8 -*-
+# Copyright 2018 New Vector 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.
diff --git a/tests/federation/transport/__init__.py b/tests/federation/transport/__init__.py
new file mode 100644
index 0000000000..a354d38ca8
--- /dev/null
+++ b/tests/federation/transport/__init__.py
@@ -0,0 +1,14 @@
+# -*- coding: utf-8 -*-
+# Copyright 2018 New Vector 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.
diff --git a/tests/federation/transport/test_client.py b/tests/federation/transport/test_client.py
new file mode 100644
index 0000000000..24d673f54f
--- /dev/null
+++ b/tests/federation/transport/test_client.py
@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+# Copyright 2018 New Vector 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.
+
+
+from tests import unittest
+
+from synapse.federation.transport.client import _create_path
+
+
+class PathEncodeTestCase(unittest.TestCase):
+    def test_path_encoding(self):
+        P = "/foo"
+
+        self.assertEqual("/foo/bar", _create_path(P, "/bar"))
+        self.assertEqual("/foo/bar/e", _create_path(P, "/bar/%s", "e"))
+        self.assertEqual("/foo/bar/%24e", _create_path(P, "/bar/%s", "$e"))
+        self.assertEqual("/foo/bar/%2Fe%2F", _create_path(P, "/bar/%s", "/e/"))
+        self.assertEqual("/foo/bar/x/y", _create_path(P, "/bar/%s/%s", "x", "y"))