summaryrefslogtreecommitdiff
path: root/Lib/test/test_urlparse.py
diff options
context:
space:
mode:
authorBerker Peksag <berker.peksag@gmail.com>2016-09-16 14:45:15 +0300
committerBerker Peksag <berker.peksag@gmail.com>2016-09-16 14:45:15 +0300
commitf8479eeb34de987a5683af9a0c446dc35b4fd534 (patch)
tree0940fd6b20ab8dfda34104ab5636267ccfcd756d /Lib/test/test_urlparse.py
parent355bbb0a2ae864acd6c719b3529c6f5cabfdd950 (diff)
parentf676748a052cacdf9963aa840bfa6107275d163e (diff)
downloadcpython-git-f8479eeb34de987a5683af9a0c446dc35b4fd534.tar.gz
Issue #25895: Merge from 3.5
Diffstat (limited to 'Lib/test/test_urlparse.py')
-rw-r--r--Lib/test/test_urlparse.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/Lib/test/test_urlparse.py b/Lib/test/test_urlparse.py
index 9165d73e82..99c5c033e3 100644
--- a/Lib/test/test_urlparse.py
+++ b/Lib/test/test_urlparse.py
@@ -425,6 +425,8 @@ class UrlParseTestCase(unittest.TestCase):
self.checkJoin('', 'http://a/./g', 'http://a/./g')
self.checkJoin('svn://pathtorepo/dir1', 'dir2', 'svn://pathtorepo/dir2')
self.checkJoin('svn+ssh://pathtorepo/dir1', 'dir2', 'svn+ssh://pathtorepo/dir2')
+ self.checkJoin('ws://a/b','g','ws://a/g')
+ self.checkJoin('wss://a/b','g','wss://a/g')
# XXX: The following tests are no longer compatible with RFC3986
# self.checkJoin(SIMPLE_BASE, '../../../g','http://a/../g')