Skip to content

Commit 108183f

Browse files
stinosdpgeorge
stinos
authored and
dpgeorge
committed
tests/misc/sys_settrace: Make test output independent of invoked path.
The original logic of reducing a full path to a relative one assumes "tests/misc" is in the filename which is limited in usage: it never works for CPython on Windows since that will use a backslash as path separator, and also won't work when the filename is a path not relative to the tests directory which happens for example in the common case of running "./run-tests -d misc". Fix all cases by printing only the bare filename, which requires them all to start with sys_settrace_ hence the renaming.
1 parent 505a185 commit 108183f

File tree

7 files changed

+195
-195
lines changed

7 files changed

+195
-195
lines changed

‎tests/misc/sys_settrace_features.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ def print_stacktrace(frame, level=0):
2020
" ",
2121
frame.f_globals["__name__"],
2222
frame.f_code.co_name,
23-
# reduce full path to some pseudo-relative
24-
"misc" + "".join(frame.f_code.co_filename.split("tests/misc")[-1:]),
23+
# Keep just the filename.
24+
"sys_settrace_" + frame.f_code.co_filename.split("sys_settrace_")[-1],
2525
frame.f_lineno,
2626
)
2727
)
@@ -95,9 +95,9 @@ def do_tests():
9595
print("Who loves the sun?")
9696
print("Not every-", factorial(3))
9797

98-
from sys_settrace_subdir import trace_generic
98+
from sys_settrace_subdir import sys_settrace_generic
9999

100-
trace_generic.run_tests()
100+
sys_settrace_generic.run_tests()
101101
return
102102

103103

‎tests/misc/sys_settrace_generator.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ def print_stacktrace(frame, level=0):
1717
" ",
1818
frame.f_globals["__name__"],
1919
frame.f_code.co_name,
20-
# reduce full path to some pseudo-relative
21-
"misc" + "".join(frame.f_code.co_filename.split("tests/misc")[-1:]),
20+
# Keep just the filename.
21+
"sys_settrace_" + frame.f_code.co_filename.split("sys_settrace_")[-1],
2222
frame.f_lineno,
2323
)
2424
)

‎tests/misc/sys_settrace_generator.py.exp‎

Lines changed: 138 additions & 138 deletions
Large diffs are not rendered by default.

‎tests/misc/sys_settrace_loop.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ def print_stacktrace(frame, level=0):
1717
" ",
1818
frame.f_globals["__name__"],
1919
frame.f_code.co_name,
20-
# reduce full path to some pseudo-relative
21-
"misc" + "".join(frame.f_code.co_filename.split("tests/misc")[-1:]),
20+
# Keep just the filename.
21+
"sys_settrace_" + frame.f_code.co_filename.split("sys_settrace_")[-1],
2222
frame.f_lineno,
2323
)
2424
)

‎tests/misc/sys_settrace_loop.py.exp‎

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,72 @@
11
### trace_handler::main event: call
2-
0: @__main__:test_loop => miscmisc/sys_settrace_loop.py:41
3-
1: @__main__:<module> => miscmisc/sys_settrace_loop.py:58
2+
0: @__main__:test_loop => sys_settrace_loop.py:41
3+
1: @__main__:<module> => sys_settrace_loop.py:58
44
### trace_handler::main event: line
5-
0: @__main__:test_loop => miscmisc/sys_settrace_loop.py:43
6-
1: @__main__:<module> => miscmisc/sys_settrace_loop.py:58
5+
0: @__main__:test_loop => sys_settrace_loop.py:43
6+
1: @__main__:<module> => sys_settrace_loop.py:58
77
### trace_handler::main event: line
8-
0: @__main__:test_loop => miscmisc/sys_settrace_loop.py:44
9-
1: @__main__:<module> => miscmisc/sys_settrace_loop.py:58
8+
0: @__main__:test_loop => sys_settrace_loop.py:44
9+
1: @__main__:<module> => sys_settrace_loop.py:58
1010
### trace_handler::main event: line
11-
0: @__main__:test_loop => miscmisc/sys_settrace_loop.py:45
12-
1: @__main__:<module> => miscmisc/sys_settrace_loop.py:58
11+
0: @__main__:test_loop => sys_settrace_loop.py:45
12+
1: @__main__:<module> => sys_settrace_loop.py:58
1313
### trace_handler::main event: line
14-
0: @__main__:test_loop => miscmisc/sys_settrace_loop.py:44
15-
1: @__main__:<module> => miscmisc/sys_settrace_loop.py:58
14+
0: @__main__:test_loop => sys_settrace_loop.py:44
15+
1: @__main__:<module> => sys_settrace_loop.py:58
1616
### trace_handler::main event: line
17-
0: @__main__:test_loop => miscmisc/sys_settrace_loop.py:45
18-
1: @__main__:<module> => miscmisc/sys_settrace_loop.py:58
17+
0: @__main__:test_loop => sys_settrace_loop.py:45
18+
1: @__main__:<module> => sys_settrace_loop.py:58
1919
### trace_handler::main event: line
20-
0: @__main__:test_loop => miscmisc/sys_settrace_loop.py:44
21-
1: @__main__:<module> => miscmisc/sys_settrace_loop.py:58
20+
0: @__main__:test_loop => sys_settrace_loop.py:44
21+
1: @__main__:<module> => sys_settrace_loop.py:58
2222
### trace_handler::main event: line
23-
0: @__main__:test_loop => miscmisc/sys_settrace_loop.py:45
24-
1: @__main__:<module> => miscmisc/sys_settrace_loop.py:58
23+
0: @__main__:test_loop => sys_settrace_loop.py:45
24+
1: @__main__:<module> => sys_settrace_loop.py:58
2525
### trace_handler::main event: line
26-
0: @__main__:test_loop => miscmisc/sys_settrace_loop.py:44
27-
1: @__main__:<module> => miscmisc/sys_settrace_loop.py:58
26+
0: @__main__:test_loop => sys_settrace_loop.py:44
27+
1: @__main__:<module> => sys_settrace_loop.py:58
2828
### trace_handler::main event: line
29-
0: @__main__:test_loop => miscmisc/sys_settrace_loop.py:45
30-
1: @__main__:<module> => miscmisc/sys_settrace_loop.py:58
29+
0: @__main__:test_loop => sys_settrace_loop.py:45
30+
1: @__main__:<module> => sys_settrace_loop.py:58
3131
### trace_handler::main event: line
32-
0: @__main__:test_loop => miscmisc/sys_settrace_loop.py:46
33-
1: @__main__:<module> => miscmisc/sys_settrace_loop.py:58
32+
0: @__main__:test_loop => sys_settrace_loop.py:46
33+
1: @__main__:<module> => sys_settrace_loop.py:58
3434
test_for_loop 3
3535
### trace_handler::main event: line
36-
0: @__main__:test_loop => miscmisc/sys_settrace_loop.py:49
37-
1: @__main__:<module> => miscmisc/sys_settrace_loop.py:58
36+
0: @__main__:test_loop => sys_settrace_loop.py:49
37+
1: @__main__:<module> => sys_settrace_loop.py:58
3838
### trace_handler::main event: line
39-
0: @__main__:test_loop => miscmisc/sys_settrace_loop.py:50
40-
1: @__main__:<module> => miscmisc/sys_settrace_loop.py:58
39+
0: @__main__:test_loop => sys_settrace_loop.py:50
40+
1: @__main__:<module> => sys_settrace_loop.py:58
4141
### trace_handler::main event: line
42-
0: @__main__:test_loop => miscmisc/sys_settrace_loop.py:51
43-
1: @__main__:<module> => miscmisc/sys_settrace_loop.py:58
42+
0: @__main__:test_loop => sys_settrace_loop.py:51
43+
1: @__main__:<module> => sys_settrace_loop.py:58
4444
### trace_handler::main event: line
45-
0: @__main__:test_loop => miscmisc/sys_settrace_loop.py:53
46-
1: @__main__:<module> => miscmisc/sys_settrace_loop.py:58
45+
0: @__main__:test_loop => sys_settrace_loop.py:53
46+
1: @__main__:<module> => sys_settrace_loop.py:58
4747
### trace_handler::main event: line
48-
0: @__main__:test_loop => miscmisc/sys_settrace_loop.py:52
49-
1: @__main__:<module> => miscmisc/sys_settrace_loop.py:58
48+
0: @__main__:test_loop => sys_settrace_loop.py:52
49+
1: @__main__:<module> => sys_settrace_loop.py:58
5050
### trace_handler::main event: line
51-
0: @__main__:test_loop => miscmisc/sys_settrace_loop.py:53
52-
1: @__main__:<module> => miscmisc/sys_settrace_loop.py:58
51+
0: @__main__:test_loop => sys_settrace_loop.py:53
52+
1: @__main__:<module> => sys_settrace_loop.py:58
5353
### trace_handler::main event: line
54-
0: @__main__:test_loop => miscmisc/sys_settrace_loop.py:52
55-
1: @__main__:<module> => miscmisc/sys_settrace_loop.py:58
54+
0: @__main__:test_loop => sys_settrace_loop.py:52
55+
1: @__main__:<module> => sys_settrace_loop.py:58
5656
### trace_handler::main event: line
57-
0: @__main__:test_loop => miscmisc/sys_settrace_loop.py:53
58-
1: @__main__:<module> => miscmisc/sys_settrace_loop.py:58
57+
0: @__main__:test_loop => sys_settrace_loop.py:53
58+
1: @__main__:<module> => sys_settrace_loop.py:58
5959
### trace_handler::main event: line
60-
0: @__main__:test_loop => miscmisc/sys_settrace_loop.py:52
61-
1: @__main__:<module> => miscmisc/sys_settrace_loop.py:58
60+
0: @__main__:test_loop => sys_settrace_loop.py:52
61+
1: @__main__:<module> => sys_settrace_loop.py:58
6262
### trace_handler::main event: line
63-
0: @__main__:test_loop => miscmisc/sys_settrace_loop.py:53
64-
1: @__main__:<module> => miscmisc/sys_settrace_loop.py:58
63+
0: @__main__:test_loop => sys_settrace_loop.py:53
64+
1: @__main__:<module> => sys_settrace_loop.py:58
6565
### trace_handler::main event: line
66-
0: @__main__:test_loop => miscmisc/sys_settrace_loop.py:54
67-
1: @__main__:<module> => miscmisc/sys_settrace_loop.py:58
66+
0: @__main__:test_loop => sys_settrace_loop.py:54
67+
1: @__main__:<module> => sys_settrace_loop.py:58
6868
test_while_loop 3
6969
### trace_handler::main event: return
70-
0: @__main__:test_loop => miscmisc/sys_settrace_loop.py:54
71-
1: @__main__:<module> => miscmisc/sys_settrace_loop.py:58
70+
0: @__main__:test_loop => sys_settrace_loop.py:54
71+
1: @__main__:<module> => sys_settrace_loop.py:58
7272
Total traces executed: 23

tests/misc/sys_settrace_subdir/trace_generic.py renamed to tests/misc/sys_settrace_subdir/sys_settrace_generic.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ def test_lambda():
4141

4242
# import
4343
def test_import():
44-
from sys_settrace_subdir import trace_importme
44+
from sys_settrace_subdir import sys_settrace_importme
4545

46-
trace_importme.dummy()
47-
trace_importme.saysomething()
46+
sys_settrace_importme.dummy()
47+
sys_settrace_importme.saysomething()
4848

4949

5050
# class

tests/misc/sys_settrace_subdir/trace_importme.py renamed to tests/misc/sys_settrace_subdir/sys_settrace_importme.py

File renamed without changes.

0 commit comments

Comments
 (0)