summaryrefslogtreecommitdiffstats
path: root/Lib/test
diff options
context:
space:
mode:
authorBerker Peksag <berker.peksag@gmail.com>2016-09-16 11:45:57 (GMT)
committerBerker Peksag <berker.peksag@gmail.com>2016-09-16 11:45:57 (GMT)
commitf670c834431ef5a183657be3ff0d919a248453fb (patch)
tree8b538acc2e6eeb656509b08796c0cbd5123d5c87 /Lib/test
parent3aba2223c846753e3817120a4b2ef09f8d4705c6 (diff)
parentf8479eeb34de987a5683af9a0c446dc35b4fd534 (diff)
downloadcpython-f670c834431ef5a183657be3ff0d919a248453fb.zip
cpython-f670c834431ef5a183657be3ff0d919a248453fb.tar.gz
cpython-f670c834431ef5a183657be3ff0d919a248453fb.tar.bz2
Issue #25895: Merge from 3.6
Diffstat (limited to 'Lib/test')
-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 9165d73..99c5c03 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')