Browse Source

[test/test_socks] Test with local SOCKS servers

totalwebcasting
Yen Chi Hsuan 9 years ago
parent
commit
e21f17fc86
No known key found for this signature in database GPG Key ID: 3FDDD575826C5C30
4 changed files with 51 additions and 3 deletions
  1. +1
    -0
      .gitignore
  2. +3
    -0
      .travis.yml
  3. +8
    -0
      devscripts/install_srelay.sh
  4. +39
    -3
      test/test_socks.py

+ 1
- 0
.gitignore View File

@ -36,3 +36,4 @@ test/local_parameters.json
youtube-dl.zsh
.idea
.idea/*
tmp/

+ 3
- 0
.travis.yml View File

@ -7,6 +7,9 @@ python:
- "3.4"
- "3.5"
sudo: false
install:
- bash ./devscripts/install_srelay.sh
- export PATH=$PATH:$(pwd)/tmp/srelay-0.4.8b6
script: nosetests test --verbose
notifications:
email:


+ 8
- 0
devscripts/install_srelay.sh View File

@ -0,0 +1,8 @@
#!/bin/bash
mkdir -p tmp && cd tmp
wget -N http://downloads.sourceforge.net/project/socks-relay/socks-relay/srelay-0.4.8/srelay-0.4.8b6.tar.gz
tar zxvf srelay-0.4.8b6.tar.gz
cd srelay-0.4.8b6
./configure
make

+ 39
- 3
test/test_socks.py View File

@ -8,11 +8,20 @@ import sys
import unittest
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
from test.helper import (FakeYDL, get_params)
from youtube_dl.compat import compat_urllib_request
import random
import subprocess
from test.helper import (
FakeYDL,
get_params,
)
from youtube_dl.compat import (
compat_str,
compat_urllib_request,
)
class TestSocks(unittest.TestCase):
class TestMultipleSocks(unittest.TestCase):
@staticmethod
def _check_params(attrs):
params = get_params()
@ -67,5 +76,32 @@ class TestSocks(unittest.TestCase):
params['secondary_server_ip'])
class TestSocks(unittest.TestCase):
def setUp(self):
self.port = random.randint(49152, 65535)
self.server_process = subprocess.Popen([
'srelay', '-f', '-i', '127.0.0.1:%d' % self.port],
stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
def tearDown(self):
self.server_process.terminate()
self.server_process.communicate()
def _get_ip(self, protocol):
ydl = FakeYDL({
'proxy': '%s://127.0.0.1:%d' % (protocol, self.port),
})
return ydl.urlopen('http://yt-dl.org/ip').read().decode('utf-8')
def test_socks4(self):
self.assertTrue(isinstance(self._get_ip('socks4'), compat_str))
def test_socks4a(self):
self.assertTrue(isinstance(self._get_ip('socks4a'), compat_str))
def test_socks5(self):
self.assertTrue(isinstance(self._get_ip('socks5'), compat_str))
if __name__ == '__main__':
unittest.main()

Loading…
Cancel
Save