@@ -112,47 +112,46 @@ def f1(x):
112
112
self .start_import_stop (cov , "f1" )
113
113
cov .save ()
114
114
115
- out_lines = debug_out .getvalue ()
116
- return out_lines
115
+ return debug_out .getvalue ()
117
116
118
117
def test_debug_no_trace (self ):
119
- out_lines = self .f1_debug_output ([])
118
+ out_text = self .f1_debug_output ([])
120
119
121
120
# We should have no output at all.
122
- assert not out_lines
121
+ assert not out_text
123
122
124
123
def test_debug_trace (self ):
125
- out_lines = self .f1_debug_output (["trace" ])
124
+ out_text = self .f1_debug_output (["trace" ])
126
125
127
126
# We should have a line like "Tracing 'f1.py'", perhaps with an
128
127
# absolute path.
129
- assert re .search (r"Tracing '.*f1.py'" , out_lines )
128
+ assert re .search (r"Tracing '.*f1.py'" , out_text )
130
129
131
130
# We should have lines like "Not tracing 'collector.py'..."
132
- assert re_lines (r"^Not tracing .*: is part of coverage.py$" , out_lines )
131
+ assert re_lines (r"^Not tracing .*: is part of coverage.py$" , out_text )
133
132
134
133
def test_debug_trace_pid (self ):
135
- out_lines = self .f1_debug_output (["trace" , "pid" ])
134
+ out_text = self .f1_debug_output (["trace" , "pid" ])
136
135
137
136
# Now our lines are always prefixed with the process id.
138
137
pid_prefix = r"^%5d\.[0-9a-f]{4}: " % os .getpid ()
139
- pid_lines = re_lines_text (pid_prefix , out_lines )
140
- assert pid_lines == out_lines
138
+ pid_lines = re_lines_text (pid_prefix , out_text )
139
+ assert pid_lines == out_text
141
140
142
141
# We still have some tracing, and some not tracing.
143
- assert re_lines (pid_prefix + "Tracing " , out_lines )
144
- assert re_lines (pid_prefix + "Not tracing " , out_lines )
142
+ assert re_lines (pid_prefix + "Tracing " , out_text )
143
+ assert re_lines (pid_prefix + "Not tracing " , out_text )
145
144
146
145
def test_debug_callers (self ):
147
- out_lines = self .f1_debug_output (["pid" , "dataop" , "dataio" , "callers" , "lock" ])
146
+ out_text = self .f1_debug_output (["pid" , "dataop" , "dataio" , "callers" , "lock" ])
148
147
# For every real message, there should be a stack trace with a line like
149
148
# "f1_debug_output : /Users/ned/coverage/tests/test_debug.py @71"
150
- real_messages = re_lines (r":\d+" , out_lines , match = False )
149
+ real_messages = re_lines (r":\d+" , out_text , match = False )
151
150
frame_pattern = r"\s+f1_debug_output : .*tests[/\\]test_debug.py:\d+$"
152
- frames = re_lines (frame_pattern , out_lines )
151
+ frames = re_lines (frame_pattern , out_text )
153
152
assert len (real_messages ) == len (frames )
154
153
155
- last_line = out_lines .splitlines ()[- 1 ]
154
+ last_line = out_text .splitlines ()[- 1 ]
156
155
157
156
# The details of what to expect on the stack are empirical, and can change
158
157
# as the code changes. This test is here to ensure that the debug code
@@ -161,7 +160,7 @@ def test_debug_callers(self):
161
160
assert re_lines (r"\s+add_file_tracers : .*coverage[/\\]sqldata.py:\d+$" , last_line )
162
161
163
162
def test_debug_config (self ):
164
- out_lines = self .f1_debug_output (["config" ])
163
+ out_text = self .f1_debug_output (["config" ])
165
164
166
165
labels = """
167
166
attempted_config_files branch config_files_read config_file cover_pylib data_file
@@ -173,10 +172,10 @@ def test_debug_config(self):
173
172
for label in labels :
174
173
label_pat = fr"^\s*{ label } : "
175
174
msg = f"Incorrect lines for { label !r} "
176
- assert 1 == len (re_lines (label_pat , out_lines )), msg
175
+ assert 1 == len (re_lines (label_pat , out_text )), msg
177
176
178
177
def test_debug_sys (self ):
179
- out_lines = self .f1_debug_output (["sys" ])
178
+ out_text = self .f1_debug_output (["sys" ])
180
179
181
180
labels = """
182
181
coverage_version coverage_module coverage_paths stdlib_paths third_party_paths
@@ -187,11 +186,11 @@ def test_debug_sys(self):
187
186
for label in labels :
188
187
label_pat = fr"^\s*{ label } : "
189
188
msg = f"Incorrect lines for { label !r} "
190
- assert 1 == len (re_lines (label_pat , out_lines )), msg
189
+ assert 1 == len (re_lines (label_pat , out_text )), msg
191
190
192
191
def test_debug_sys_ctracer (self ):
193
- out_lines = self .f1_debug_output (["sys" ])
194
- tracer_line = re_line (r"CTracer:" , out_lines ).strip ()
192
+ out_text = self .f1_debug_output (["sys" ])
193
+ tracer_line = re_line (r"CTracer:" , out_text ).strip ()
195
194
if env .C_TRACER :
196
195
expected = "CTracer: available"
197
196
else :
0 commit comments