File tree Expand file tree Collapse file tree 1 file changed +5
-4
lines changed Expand file tree Collapse file tree 1 file changed +5
-4
lines changed Original file line number Diff line number Diff line change @@ -73,6 +73,7 @@ def legitimate_quit():
73
73
else :
74
74
assert proc .stdout .count ("success" ) == 1
75
75
76
+
76
77
@pytest .mark .backend ('TkAgg' , skip_on_importerror = True )
77
78
@pytest .mark .flaky (reruns = 3 )
78
79
def test_figuremanager_cleans_own_mainloop ():
@@ -151,18 +152,18 @@ def test_never_update():
151
152
env = {** os .environ , "SOURCE_DATE_EPOCH" : "0" },
152
153
timeout = _test_timeout ,
153
154
capture_output = True ,
154
- check = True ,
155
155
universal_newlines = True ,
156
156
)
157
- except subprocess .CalledProcessError :
158
- pytest .fail ("Subprocess failed to test intended behavior " )
157
+ except subprocess .TimeoutExpired :
158
+ pytest .fail ("Subprocess timed out " )
159
159
else :
160
160
# test framework doesn't see tkinter callback exceptions normally
161
161
# see tkinter.Misc.report_callback_exception
162
162
assert "Exception in Tkinter callback" not in proc .stderr
163
- finally :
164
163
# make sure we can see other issues
165
164
print (proc .stderr , file = sys .stderr )
165
+ if proc .returncode :
166
+ pytest .fail ("Subprocess failed to test intended behavior" )
166
167
167
168
168
169
@pytest .mark .backend ('TkAgg' , skip_on_importerror = True )
You can’t perform that action at this time.
0 commit comments