about summary refs log tree commit diff
diff options
context:
space:
mode:
authorYen Chi Hsuan <yan12125@gmail.com>2016-07-03 23:50:55 +0800
committerYen Chi Hsuan <yan12125@gmail.com>2016-07-03 23:50:55 +0800
commit40f3666f6b2431d8756a36d574139c8885b15c53 (patch)
tree3e459d26175fb32eb3c0f1360771a23cf82b2325
parentdd801bbe18535c98172df929eedd3e8dd8100409 (diff)
downloadyoutube-dl-40f3666f6b2431d8756a36d574139c8885b15c53.tar.gz
youtube-dl-40f3666f6b2431d8756a36d574139c8885b15c53.tar.xz
youtube-dl-40f3666f6b2431d8756a36d574139c8885b15c53.zip
[test/test_http] Update tests for 38cce791c71e9da33854e56114233d60345e18c0
-rw-r--r--test/test_http.py20
1 files changed, 10 insertions, 10 deletions
diff --git a/test/test_http.py b/test/test_http.py
index 5076ced51..fdc68ccb4 100644
--- a/test/test_http.py
+++ b/test/test_http.py
@@ -138,27 +138,27 @@ class TestProxy(unittest.TestCase):
         self.proxy_thread.daemon = True
         self.proxy_thread.start()
 
-        self.cn_proxy = compat_http_server.HTTPServer(
-            ('localhost', 0), _build_proxy_handler('cn'))
-        self.cn_port = http_server_port(self.cn_proxy)
-        self.cn_proxy_thread = threading.Thread(target=self.cn_proxy.serve_forever)
-        self.cn_proxy_thread.daemon = True
-        self.cn_proxy_thread.start()
+        self.geo_proxy = compat_http_server.HTTPServer(
+            ('localhost', 0), _build_proxy_handler('geo'))
+        self.geo_port = http_server_port(self.geo_proxy)
+        self.geo_proxy_thread = threading.Thread(target=self.geo_proxy.serve_forever)
+        self.geo_proxy_thread.daemon = True
+        self.geo_proxy_thread.start()
 
     def test_proxy(self):
-        cn_proxy = 'localhost:{0}'.format(self.cn_port)
+        geo_proxy = 'localhost:{0}'.format(self.geo_port)
         ydl = YoutubeDL({
             'proxy': 'localhost:{0}'.format(self.port),
-            'cn_verification_proxy': cn_proxy,
+            'geo_verification_proxy': geo_proxy,
         })
         url = 'http://foo.com/bar'
         response = ydl.urlopen(url).read().decode('utf-8')
         self.assertEqual(response, 'normal: {0}'.format(url))
 
         req = compat_urllib_request.Request(url)
-        req.add_header('Ytdl-request-proxy', cn_proxy)
+        req.add_header('Ytdl-request-proxy', geo_proxy)
         response = ydl.urlopen(req).read().decode('utf-8')
-        self.assertEqual(response, 'cn: {0}'.format(url))
+        self.assertEqual(response, 'geo: {0}'.format(url))
 
     def test_proxy_with_idn(self):
         ydl = YoutubeDL({