diff options
| author | Yen Chi Hsuan <[email protected]> | 2016-04-23 21:30:44 +0800 |
|---|---|---|
| committer | Yen Chi Hsuan <[email protected]> | 2016-05-10 14:51:38 +0800 |
| commit | 72f3289ac48d8dbfe1ee3fd2d82a23f1bff045df (patch) | |
| tree | bc1b090fa50a26ae61532df8e07345a9144edfcd /test/helper.py | |
| parent | 71aff18809a70b7fa32d8fd07f4fb2f64641aea5 (diff) | |
| download | youtube-dl-72f3289ac48d8dbfe1ee3fd2d82a23f1bff045df.tar.gz youtube-dl-72f3289ac48d8dbfe1ee3fd2d82a23f1bff045df.zip | |
[test/test_socks] Add tests for SOCKS proxies
Diffstat (limited to 'test/helper.py')
| -rw-r--r-- | test/helper.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/test/helper.py b/test/helper.py index b8e22c5cb..dfee217a9 100644 --- a/test/helper.py +++ b/test/helper.py @@ -24,8 +24,13 @@ from youtube_dl.utils import ( def get_params(override=None): PARAMETERS_FILE = os.path.join(os.path.dirname(os.path.abspath(__file__)), "parameters.json") + LOCAL_PARAMETERS_FILE = os.path.join(os.path.dirname(os.path.abspath(__file__)), + "local_parameters.json") with io.open(PARAMETERS_FILE, encoding='utf-8') as pf: parameters = json.load(pf) + if os.path.exists(LOCAL_PARAMETERS_FILE): + with io.open(LOCAL_PARAMETERS_FILE, encoding='utf-8') as pf: + parameters.update(json.load(pf)) if override: parameters.update(override) return parameters |