aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/test_compat.py10
-rw-r--r--test/test_execution.py11
-rw-r--r--test/test_utils.py22
-rw-r--r--test/test_verbose_output.py12
-rw-r--r--test/test_write_annotations.py.disabled1
-rw-r--r--test/test_youtube_signature.py5
6 files changed, 35 insertions, 26 deletions
diff --git a/test/test_compat.py b/test/test_compat.py
index 20dab9573..29e7384f0 100644
--- a/test/test_compat.py
+++ b/test/test_compat.py
@@ -35,10 +35,12 @@ class TestCompat(unittest.TestCase):
def test_compat_expanduser(self):
old_home = os.environ.get('HOME')
- test_str = r'C:\Documents and Settings\тест\Application Data'
- compat_setenv('HOME', test_str)
- self.assertEqual(compat_expanduser('~'), test_str)
- compat_setenv('HOME', old_home or '')
+ test_str = R'C:\Documents and Settings\тест\Application Data'
+ try:
+ compat_setenv('HOME', test_str)
+ self.assertEqual(compat_expanduser('~'), test_str)
+ finally:
+ compat_setenv('HOME', old_home or '')
def test_all_present(self):
import yt_dlp.compat
diff --git a/test/test_execution.py b/test/test_execution.py
index 6a3e9944b..6efd432e9 100644
--- a/test/test_execution.py
+++ b/test/test_execution.py
@@ -1,4 +1,5 @@
#!/usr/bin/env python3
+import contextlib
import os
import subprocess
import sys
@@ -22,14 +23,14 @@ class TestExecution(unittest.TestCase):
subprocess.check_call([sys.executable, '-c', 'import yt_dlp'], cwd=rootDir)
def test_module_exec(self):
- subprocess.check_call([sys.executable, '-m', 'yt_dlp', '--version'], cwd=rootDir, stdout=_DEV_NULL)
+ subprocess.check_call([sys.executable, '-m', 'yt_dlp', '--ignore-config', '--version'], cwd=rootDir, stdout=_DEV_NULL)
def test_main_exec(self):
- subprocess.check_call([sys.executable, 'yt_dlp/__main__.py', '--version'], cwd=rootDir, stdout=_DEV_NULL)
+ subprocess.check_call([sys.executable, 'yt_dlp/__main__.py', '--ignore-config', '--version'], cwd=rootDir, stdout=_DEV_NULL)
def test_cmdline_umlauts(self):
p = subprocess.Popen(
- [sys.executable, 'yt_dlp/__main__.py', encodeArgument('ä'), '--version'],
+ [sys.executable, 'yt_dlp/__main__.py', '--ignore-config', encodeArgument('ä'), '--version'],
cwd=rootDir, stdout=_DEV_NULL, stderr=subprocess.PIPE)
_, stderr = p.communicate()
self.assertFalse(stderr)
@@ -39,10 +40,8 @@ class TestExecution(unittest.TestCase):
subprocess.check_call([sys.executable, 'devscripts/make_lazy_extractors.py', 'yt_dlp/extractor/lazy_extractors.py'], cwd=rootDir, stdout=_DEV_NULL)
subprocess.check_call([sys.executable, 'test/test_all_urls.py'], cwd=rootDir, stdout=_DEV_NULL)
finally:
- try:
+ with contextlib.suppress(OSError):
os.remove('yt_dlp/extractor/lazy_extractors.py')
- except OSError:
- pass
if __name__ == '__main__':
diff --git a/test/test_utils.py b/test/test_utils.py
index 7909dc61c..5e220087b 100644
--- a/test/test_utils.py
+++ b/test/test_utils.py
@@ -1,5 +1,6 @@
#!/usr/bin/env python3
# Allow direct execution
+import contextlib
import os
import sys
import unittest
@@ -267,11 +268,18 @@ class TestUtil(unittest.TestCase):
compat_setenv('yt_dlp_EXPATH_PATH', 'expanded')
self.assertEqual(expand_path(env('yt_dlp_EXPATH_PATH')), 'expanded')
- self.assertEqual(expand_path(env('HOME')), compat_getenv('HOME'))
- self.assertEqual(expand_path('~'), compat_getenv('HOME'))
- self.assertEqual(
- expand_path('~/%s' % env('yt_dlp_EXPATH_PATH')),
- '%s/expanded' % compat_getenv('HOME'))
+
+ old_home = os.environ.get('HOME')
+ test_str = R'C:\Documents and Settings\тест\Application Data'
+ try:
+ compat_setenv('HOME', test_str)
+ self.assertEqual(expand_path(env('HOME')), compat_getenv('HOME'))
+ self.assertEqual(expand_path('~'), compat_getenv('HOME'))
+ self.assertEqual(
+ expand_path('~/%s' % env('yt_dlp_EXPATH_PATH')),
+ '%s/expanded' % compat_getenv('HOME'))
+ finally:
+ compat_setenv('HOME', old_home or '')
def test_prepend_extension(self):
self.assertEqual(prepend_extension('abc.ext', 'temp'), 'abc.temp.ext')
@@ -1814,10 +1822,8 @@ Line 1
else:
self.assertFalse(testing_write, f'{test_mode} is not blocked by {lock_mode}')
finally:
- try:
+ with contextlib.suppress(OSError):
os.remove(FILE)
- except Exception:
- pass
if __name__ == '__main__':
diff --git a/test/test_verbose_output.py b/test/test_verbose_output.py
index 1213a9726..657994074 100644
--- a/test/test_verbose_output.py
+++ b/test/test_verbose_output.py
@@ -13,7 +13,8 @@ class TestVerboseOutput(unittest.TestCase):
def test_private_info_arg(self):
outp = subprocess.Popen(
[
- sys.executable, 'yt_dlp/__main__.py', '-v',
+ sys.executable, 'yt_dlp/__main__.py',
+ '-v', '--ignore-config',
'--username', 'johnsmith@gmail.com',
'--password', 'my_secret_password',
], cwd=rootDir, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
@@ -26,7 +27,8 @@ class TestVerboseOutput(unittest.TestCase):
def test_private_info_shortarg(self):
outp = subprocess.Popen(
[
- sys.executable, 'yt_dlp/__main__.py', '-v',
+ sys.executable, 'yt_dlp/__main__.py',
+ '-v', '--ignore-config',
'-u', 'johnsmith@gmail.com',
'-p', 'my_secret_password',
], cwd=rootDir, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
@@ -39,7 +41,8 @@ class TestVerboseOutput(unittest.TestCase):
def test_private_info_eq(self):
outp = subprocess.Popen(
[
- sys.executable, 'yt_dlp/__main__.py', '-v',
+ sys.executable, 'yt_dlp/__main__.py',
+ '-v', '--ignore-config',
'--username=johnsmith@gmail.com',
'--password=my_secret_password',
], cwd=rootDir, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
@@ -52,7 +55,8 @@ class TestVerboseOutput(unittest.TestCase):
def test_private_info_shortarg_eq(self):
outp = subprocess.Popen(
[
- sys.executable, 'yt_dlp/__main__.py', '-v',
+ sys.executable, 'yt_dlp/__main__.py',
+ '-v', '--ignore-config',
'-u=johnsmith@gmail.com',
'-p=my_secret_password',
], cwd=rootDir, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
diff --git a/test/test_write_annotations.py.disabled b/test/test_write_annotations.py.disabled
index bf13efe2c..cca60561f 100644
--- a/test/test_write_annotations.py.disabled
+++ b/test/test_write_annotations.py.disabled
@@ -6,7 +6,6 @@ import unittest
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-import io
import xml.etree.ElementTree
from test.helper import get_params, is_download_test, try_rm
diff --git a/test/test_youtube_signature.py b/test/test_youtube_signature.py
index ca23c910d..2c2013295 100644
--- a/test/test_youtube_signature.py
+++ b/test/test_youtube_signature.py
@@ -1,5 +1,6 @@
#!/usr/bin/env python3
# Allow direct execution
+import contextlib
import os
import sys
import unittest
@@ -127,11 +128,9 @@ class TestSignature(unittest.TestCase):
os.mkdir(self.TESTDATA_DIR)
def tearDown(self):
- try:
+ with contextlib.suppress(OSError):
for f in os.listdir(self.TESTDATA_DIR):
os.remove(f)
- except OSError:
- pass
def t_factory(name, sig_func, url_pattern):
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-12 22:27:38 +0000