Skip to content

Update exception tests from CPython v3.10.5 #3873

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
youknowone merged 8 commits into from
Jul 14, 2022
Merged

Update exception tests from CPython v3.10.5 #3873

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4030ad1
Update test_exceptions.py from CPython 3.10.5
key262yek Jul 11, 2022
43824e3
Change Lib/test/test_exceptions.py runable
key262yek Jul 11, 2022
82efdeb
Update Lib/test/test_syntax.py from CPython v3.10.5
key262yek Jul 11, 2022
b490f52
Update Lib/test/test_syntax.py to be runable
key262yek Jul 12, 2022
e86a1bc
Copy Lib/test/test_cmd_line_script.py from CPython v3.10.5
key262yek Jul 12, 2022
9f29dc5
Update Lib/test/test_cmd_line_script.py to be runable
key262yek Jul 12, 2022
5ab55dc
Add expectedFailure tag to test_non_ascii
key262yek Jul 12, 2022
4400493
Specify expectedFailure of test_non_ascii in Lib/test/test_cmd_line_s…
key262yek Jul 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 51 additions & 22 deletions Lib/test/test_cmd_line_script.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,11 @@

import textwrap
from test import support
from test.support import import_helper
from test.support import os_helper
from test.support.script_helper import (
make_pkg, make_script, make_zip_pkg, make_zip_script,
assert_python_ok, assert_python_failure, spawn_python, kill_python)
from test.support import os_helper, import_helper

verbose = support.verbose

Expand Down Expand Up @@ -228,6 +229,21 @@ def test_basic_script(self):
with os_helper.temp_dir() as script_dir:
script_name = _make_test_script(script_dir, 'script')
self._check_script(script_name, script_name, script_name,
script_dir, None,
importlib.machinery.SourceFileLoader,
expected_cwd=script_dir)

# TODO: RUSTPYTHON
@unittest.expectedFailure
def test_script_abspath(self):
# pass the script using the relative path, expect the absolute path
# in __file__
with os_helper.temp_cwd() as script_dir:
self.assertTrue(os.path.isabs(script_dir), script_dir)

script_name = _make_test_script(script_dir, 'script')
relative_name = os.path.basename(script_name)
self._check_script(relative_name, script_name, relative_name,
script_dir, None,
importlib.machinery.SourceFileLoader)

Expand Down Expand Up @@ -406,7 +422,7 @@ def test_issue8202_dash_c_file_ignored(self):
# does not alter the value of sys.path[0]
with os_helper.temp_dir() as script_dir:
with os_helper.change_cwd(path=script_dir):
with open("-c", "w") as f:
with open("-c", "w", encoding="utf-8") as f:
f.write("data")
rc, out, err = assert_python_ok('-c',
'import sys; print("sys.path[0]==%r" % sys.path[0])',
Expand All @@ -422,7 +438,7 @@ def test_issue8202_dash_m_file_ignored(self):
with os_helper.temp_dir() as script_dir:
script_name = _make_test_script(script_dir, 'other')
with os_helper.change_cwd(path=script_dir):
with open("-m", "w") as f:
with open("-m", "w", encoding="utf-8") as f:
f.write("data")
rc, out, err = assert_python_ok('-m', 'other', *example_args,
__isolated=False)
Expand All @@ -435,7 +451,7 @@ def test_issue20884(self):
# will be failed.
with os_helper.temp_dir() as script_dir:
script_name = os.path.join(script_dir, "issue20884.py")
with open(script_name, "w", newline='\n') as f:
with open(script_name, "w", encoding="latin1", newline='\n') as f:
f.write("#coding: iso-8859-1\n")
f.write('"""\n')
for _ in range(30):
Expand Down Expand Up @@ -507,6 +523,18 @@ def test_dash_m_bad_pyc(self):
self.assertNotIn(b'is a package', err)
self.assertNotIn(b'Traceback', err)

# TODO: RUSTPYTHON
@unittest.expectedFailure
def test_hint_when_triying_to_import_a_py_file(self):
with os_helper.temp_dir() as script_dir, \
os_helper.change_cwd(path=script_dir):
# Create invalid *.pyc as empty file
with open('asyncio.py', 'wb'):
pass
err = self.check_dash_m_failure('asyncio.py')
self.assertIn(b"Try using 'asyncio' instead "
b"of 'asyncio.py' as the module name", err)

def test_dash_m_init_traceback(self):
# These were wrapped in an ImportError and tracebacks were
# suppressed; see Issue 14285
Expand Down Expand Up @@ -546,7 +574,7 @@ def test_pep_409_verbiage(self):
script_name = _make_test_script(script_dir, 'script', script)
exitcode, stdout, stderr = assert_python_failure(script_name)
text = stderr.decode('ascii').split('\n')
self.assertEqual(len(text), 4)
self.assertEqual(len(text), 5)
self.assertTrue(text[0].startswith('Traceback'))
self.assertTrue(text[1].startswith(' File '))
self.assertTrue(text[3].startswith('NameError'))
Expand All @@ -565,7 +593,7 @@ def test_non_ascii(self):

# Issue #16218
source = 'print(ascii(__file__))\n'
script_name = _make_test_script(os.curdir, name, source)
script_name = _make_test_script(os.getcwd(), name, source)
self.addCleanup(os_helper.unlink, script_name)
rc, stdout, stderr = assert_python_ok(script_name)
self.assertEqual(
Expand All @@ -578,8 +606,6 @@ def test_non_ascii(self):
if sys.platform == "linux":
test_non_ascii = unittest.expectedFailure(test_non_ascii)

# TODO: RUSTPYTHON
@unittest.expectedFailure
def test_issue20500_exit_with_exception_value(self):
script = textwrap.dedent("""\
import sys
Expand All @@ -596,7 +622,7 @@ def test_issue20500_exit_with_exception_value(self):
script_name = _make_test_script(script_dir, 'script', script)
exitcode, stdout, stderr = assert_python_failure(script_name)
text = stderr.decode('ascii')
self.assertEqual(text, "some text")
self.assertEqual(text.rstrip(), "some text")

# TODO: RUSTPYTHON
@unittest.expectedFailure
Expand All @@ -606,8 +632,8 @@ def test_syntaxerror_unindented_caret_position(self):
script_name = _make_test_script(script_dir, 'script', script)
exitcode, stdout, stderr = assert_python_failure(script_name)
text = io.TextIOWrapper(io.BytesIO(stderr), 'ascii').read()
# Confirm that the caret is located under the first 1 character
self.assertIn("\n 1 + 1 = 2\n ^", text)
# Confirm that the caret is located under the '=' sign
self.assertIn("\n ^^^^^\n", text)

# TODO: RUSTPYTHON
@unittest.expectedFailure
Expand All @@ -620,8 +646,8 @@ def test_syntaxerror_indented_caret_position(self):
script_name = _make_test_script(script_dir, 'script', script)
exitcode, stdout, stderr = assert_python_failure(script_name)
text = io.TextIOWrapper(io.BytesIO(stderr), 'ascii').read()
# Confirm that the caret is located under the first 1 character
self.assertIn("\n 1 + 1 = 2\n ^", text)
# Confirm that the caret starts under the first 1 character
self.assertIn("\n 1 + 1 = 2\n ^^^^^\n", text)

# Try the same with a form feed at the start of the indented line
script = (
Expand All @@ -632,7 +658,7 @@ def test_syntaxerror_indented_caret_position(self):
exitcode, stdout, stderr = assert_python_failure(script_name)
text = io.TextIOWrapper(io.BytesIO(stderr), "ascii").read()
self.assertNotIn("\f", text)
self.assertIn("\n 1 + 1 = 2\n ^", text)
self.assertIn("\n 1 + 1 = 2\n ^^^^^\n", text)

# TODO: RUSTPYTHON
@unittest.expectedFailure
Expand All @@ -644,7 +670,7 @@ def test_syntaxerror_multi_line_fstring(self):
self.assertEqual(
stderr.splitlines()[-3:],
[
b' foo = f"""{}',
b' foo"""',
b' ^',
b'SyntaxError: f-string: empty expression not allowed',
],
Expand All @@ -653,18 +679,17 @@ def test_syntaxerror_multi_line_fstring(self):
# TODO: RUSTPYTHON
@unittest.expectedFailure
def test_syntaxerror_invalid_escape_sequence_multi_line(self):
script = 'foo = """\\q\n"""\n'
script = 'foo = """\\q"""\n'
with os_helper.temp_dir() as script_dir:
script_name = _make_test_script(script_dir, 'script', script)
exitcode, stdout, stderr = assert_python_failure(
'-Werror', script_name,
)
self.assertEqual(
stderr.splitlines()[-3:],
[
b' foo = """\\q',
b' ^',
b'SyntaxError: invalid escape sequence \\q',
[ b' foo = """\\q"""',
b' ^^^^^^^^',
b'SyntaxError: invalid escape sequence \'\\q\''
],
)

Expand Down Expand Up @@ -743,7 +768,7 @@ def test_consistent_sys_path_for_module_execution(self):
def test_nonexisting_script(self):
# bpo-34783: "./python script.py" must not crash
# if the script file doesn't exist.
# (Skip test for macOS framework builds because sys.excutable name
# (Skip test for macOS framework builds because sys.executable name
# is not the actual Python executable file name.
script = 'nonexistingscript.py'
self.assertFalse(os.path.exists(script))
Expand All @@ -755,10 +780,14 @@ def test_nonexisting_script(self):
self.assertIn(": can't open file ", err)
self.assertNotEqual(proc.returncode, 0)


# TODO: RUSTPYTHON
# def tearDownModule():
Comment thread
key262yek marked this conversation as resolved.
Resolved
def test_main():
support.run_unittest(CmdLineTest)
support.reap_children()


if __name__ == '__main__':
# TODO: RUSTPYTHON
# unittest.main()
Comment thread
key262yek marked this conversation as resolved.
Resolved
test_main()
Loading