10
10
# https://docs.python.org/3/whatsnew/3.6.html#pep-525-asynchronous-generators
11
11
ASYNC_GENERATORS = sys .version_info >= (3 , 6 )
12
12
13
+ timeout = 15
14
+
13
15
14
16
# https://github.com/pytest-dev/pytest/issues/6505
15
17
def force_plural (name ):
@@ -117,7 +119,7 @@ def f():
117
119
yield 42
118
120
""" .format (import_path = import_path , decorator = decorator )
119
121
testdir .makepyfile (test_file )
120
- rr = testdir .run (sys .executable , "-m" , "pytest" , "-v" , * cmd_opts )
122
+ rr = testdir .run (sys .executable , "-m" , "pytest" , "-v" , * cmd_opts , timeout = timeout )
121
123
122
124
expected_outcomes = {"passed" : 1 }
123
125
if should_warn :
@@ -161,7 +163,7 @@ def test_succeed(foo):
161
163
pass
162
164
""" .format (import_path = import_path , function = function )
163
165
testdir .makepyfile (test_file )
164
- rr = testdir .run (sys .executable , "-m" , "pytest" , "-v" , * cmd_opts )
166
+ rr = testdir .run (sys .executable , "-m" , "pytest" , "-v" , * cmd_opts , timeout = timeout )
165
167
166
168
expected_outcomes = {"passed" : 1 }
167
169
if should_warn :
@@ -186,7 +188,7 @@ def doit():
186
188
return d
187
189
"""
188
190
testdir .makepyfile (test_file )
189
- rr = testdir .run (sys .executable , "-m" , "pytest" , * cmd_opts )
191
+ rr = testdir .run (sys .executable , "-m" , "pytest" , * cmd_opts , timeout = timeout )
190
192
assert_outcomes (rr , {"failed" : 1 })
191
193
192
194
@@ -200,7 +202,7 @@ def test_succeed():
200
202
return d
201
203
"""
202
204
testdir .makepyfile (test_file )
203
- rr = testdir .run (sys .executable , "-m" , "pytest" , * cmd_opts )
205
+ rr = testdir .run (sys .executable , "-m" , "pytest" , * cmd_opts , timeout = timeout )
204
206
assert_outcomes (rr , {"passed" : 1 })
205
207
206
208
@@ -212,7 +214,7 @@ def test_succeed():
212
214
return 42
213
215
"""
214
216
testdir .makepyfile (test_file )
215
- rr = testdir .run (sys .executable , "-m" , "pytest" , * cmd_opts )
217
+ rr = testdir .run (sys .executable , "-m" , "pytest" , * cmd_opts , timeout = timeout )
216
218
assert_outcomes (rr , {"passed" : 1 })
217
219
218
220
@@ -222,7 +224,7 @@ def test_more_fail():
222
224
raise RuntimeError("foo")
223
225
"""
224
226
testdir .makepyfile (test_file )
225
- rr = testdir .run (sys .executable , "-m" , "pytest" , * cmd_opts )
227
+ rr = testdir .run (sys .executable , "-m" , "pytest" , * cmd_opts , timeout = timeout )
226
228
assert_outcomes (rr , {"failed" : 1 })
227
229
228
230
@@ -243,7 +245,7 @@ def test_succeed(foo):
243
245
raise RuntimeError("baz")
244
246
"""
245
247
testdir .makepyfile (test_file )
246
- rr = testdir .run (sys .executable , "-m" , "pytest" , "-v" , * cmd_opts )
248
+ rr = testdir .run (sys .executable , "-m" , "pytest" , "-v" , * cmd_opts , timeout = timeout )
247
249
assert_outcomes (rr , {"passed" : 2 , "failed" : 1 })
248
250
249
251
@@ -265,7 +267,7 @@ async def test_succeed(foo):
265
267
raise RuntimeError("baz")
266
268
"""
267
269
testdir .makepyfile (test_file )
268
- rr = testdir .run (sys .executable , "-m" , "pytest" , "-v" , * cmd_opts )
270
+ rr = testdir .run (sys .executable , "-m" , "pytest" , "-v" , * cmd_opts , timeout = timeout )
269
271
assert_outcomes (rr , {"passed" : 2 , "failed" : 1 })
270
272
271
273
@@ -285,7 +287,7 @@ def test_MAIN():
285
287
assert MAIN is greenlet.getcurrent()
286
288
"""
287
289
testdir .makepyfile (test_file )
288
- rr = testdir .run (sys .executable , "-m" , "pytest" , "-v" , * cmd_opts )
290
+ rr = testdir .run (sys .executable , "-m" , "pytest" , "-v" , * cmd_opts , timeout = timeout )
289
291
assert_outcomes (rr , {"passed" : 1 })
290
292
291
293
@@ -310,7 +312,7 @@ def test_succeed(foo):
310
312
raise RuntimeError("baz")
311
313
"""
312
314
testdir .makepyfile (test_file )
313
- rr = testdir .run (sys .executable , "-m" , "pytest" , "-v" , * cmd_opts )
315
+ rr = testdir .run (sys .executable , "-m" , "pytest" , "-v" , * cmd_opts , timeout = timeout )
314
316
assert_outcomes (rr , {"passed" : 2 , "failed" : 1 })
315
317
316
318
@@ -336,7 +338,7 @@ async def test_succeed(foo):
336
338
raise RuntimeError("baz")
337
339
"""
338
340
testdir .makepyfile (test_file )
339
- rr = testdir .run (sys .executable , "-m" , "pytest" , "-v" , * cmd_opts )
341
+ rr = testdir .run (sys .executable , "-m" , "pytest" , "-v" , * cmd_opts , timeout = timeout )
340
342
assert_outcomes (rr , {"passed" : 2 , "failed" : 1 })
341
343
342
344
@@ -372,7 +374,7 @@ def test_succeed_blue(foo):
372
374
raise RuntimeError("baz")
373
375
"""
374
376
testdir .makepyfile (test_file )
375
- rr = testdir .run (sys .executable , "-m" , "pytest" , "-v" , * cmd_opts )
377
+ rr = testdir .run (sys .executable , "-m" , "pytest" , "-v" , * cmd_opts , timeout = timeout )
376
378
assert_outcomes (rr , {"passed" : 2 , "failed" : 1 })
377
379
378
380
@@ -409,7 +411,7 @@ def test_succeed(this, that):
409
411
testdir .makepyfile (test_file )
410
412
# TODO: add a timeout, failure just hangs indefinitely for now
411
413
# https://github.com/pytest-dev/pytest/issues/4073
412
- rr = testdir .run (sys .executable , "-m" , "pytest" , "-v" , * cmd_opts )
414
+ rr = testdir .run (sys .executable , "-m" , "pytest" , "-v" , * cmd_opts , timeout = timeout )
413
415
assert_outcomes (rr , {"passed" : 1 })
414
416
415
417
@@ -448,7 +450,7 @@ def test_succeed(foo):
448
450
raise RuntimeError("baz")
449
451
"""
450
452
testdir .makepyfile (test_file )
451
- rr = testdir .run (sys .executable , "-m" , "pytest" , "-v" , * cmd_opts )
453
+ rr = testdir .run (sys .executable , "-m" , "pytest" , "-v" , * cmd_opts , timeout = timeout )
452
454
# TODO: this is getting super imprecise...
453
455
assert_outcomes (rr , {"passed" : 4 , "failed" : 1 , "errors" : 2 })
454
456
@@ -497,7 +499,7 @@ def test_second(foo):
497
499
check_me = 2
498
500
"""
499
501
testdir .makepyfile (test_file )
500
- rr = testdir .run (sys .executable , "-m" , "pytest" , "-v" , * cmd_opts )
502
+ rr = testdir .run (sys .executable , "-m" , "pytest" , "-v" , * cmd_opts , timeout = timeout )
501
503
assert_outcomes (rr , {"passed" : 2 })
502
504
503
505
@@ -526,7 +528,7 @@ async def test_doublefour(doublefour):
526
528
assert doublefour == 8
527
529
"""
528
530
testdir .makepyfile (test_file )
529
- rr = testdir .run (sys .executable , "-m" , "pytest" , "-v" , * cmd_opts )
531
+ rr = testdir .run (sys .executable , "-m" , "pytest" , "-v" , * cmd_opts , timeout = timeout )
530
532
assert_outcomes (rr , {"passed" : 2 })
531
533
532
534
@@ -555,7 +557,7 @@ async def test_doublefour(doublefour):
555
557
assert doublefour == 8
556
558
"""
557
559
testdir .makepyfile (test_file )
558
- rr = testdir .run (sys .executable , "-m" , "pytest" , "-v" , * cmd_opts )
560
+ rr = testdir .run (sys .executable , "-m" , "pytest" , "-v" , * cmd_opts , timeout = timeout )
559
561
assert_outcomes (rr , {"passed" : 2 })
560
562
561
563
@@ -602,7 +604,7 @@ async def test_doubleincrement(doubleincrement):
602
604
assert (first, second) == (0, 2)
603
605
""" .format (maybe_async = maybe_async , maybe_await = maybe_await )
604
606
testdir .makepyfile (test_file )
605
- rr = testdir .run (sys .executable , "-m" , "pytest" , "-v" , * cmd_opts )
607
+ rr = testdir .run (sys .executable , "-m" , "pytest" , "-v" , * cmd_opts , timeout = timeout )
606
608
assert_outcomes (rr , {"passed" : 2 })
607
609
# assert_outcomes(rr, {"passed": 1})
608
610
@@ -650,7 +652,7 @@ async def test_doubleincrement(doubleincrement):
650
652
assert (first, second) == (0, 2)
651
653
""" .format (maybe_async = maybe_async , maybe_await = maybe_await )
652
654
testdir .makepyfile (test_file )
653
- rr = testdir .run (sys .executable , "-m" , "pytest" , "-v" , * cmd_opts )
655
+ rr = testdir .run (sys .executable , "-m" , "pytest" , "-v" , * cmd_opts , timeout = timeout )
654
656
assert_outcomes (rr , {"passed" : 2 })
655
657
656
658
@@ -678,7 +680,7 @@ def test_succeed():
678
680
return d
679
681
"""
680
682
testdir .makepyfile (test_file )
681
- rr = testdir .run (sys .executable , "-m" , "pytest" , "-v" , * cmd_opts )
683
+ rr = testdir .run (sys .executable , "-m" , "pytest" , "-v" , * cmd_opts , timeout = timeout )
682
684
assert_outcomes (rr , {"passed" : 1 })
683
685
684
686
@@ -695,7 +697,7 @@ def test_succeed():
695
697
pass
696
698
"""
697
699
testdir .makepyfile (test_file )
698
- rr = testdir .run (sys .executable , "-m" , "pytest" , "-v" , * cmd_opts )
700
+ rr = testdir .run (sys .executable , "-m" , "pytest" , "-v" , * cmd_opts , timeout = timeout )
699
701
assert "WrongReactorAlreadyInstalledError" in rr .stderr .str ()
700
702
701
703
@@ -725,7 +727,7 @@ def test_succeed():
725
727
return d
726
728
"""
727
729
testdir .makepyfile (test_file )
728
- rr = testdir .run (sys .executable , "-m" , "pytest" , "-v" , * cmd_opts )
730
+ rr = testdir .run (sys .executable , "-m" , "pytest" , "-v" , * cmd_opts , timeout = timeout )
729
731
assert_outcomes (rr , {"passed" : 1 })
730
732
731
733
@@ -742,7 +744,7 @@ def test_succeed():
742
744
pass
743
745
"""
744
746
testdir .makepyfile (test_file )
745
- rr = testdir .run (sys .executable , "-m" , "pytest" , "-v" , * cmd_opts )
747
+ rr = testdir .run (sys .executable , "-m" , "pytest" , "-v" , * cmd_opts , timeout = timeout )
746
748
assert "WrongReactorAlreadyInstalledError" in rr .stderr .str ()
747
749
748
750
@@ -794,10 +796,10 @@ def main():
794
796
"""
795
797
testdir .makepyfile (runner = runner_file )
796
798
# check test file is ok in standalone mode:
797
- rr = testdir .run (sys .executable , "-m" , "pytest" , "-v" )
799
+ rr = testdir .run (sys .executable , "-m" , "pytest" , "-v" , timeout = timeout )
798
800
assert_outcomes (rr , {"passed" : 1 , "failed" : 1 })
799
801
# test embedded mode:
800
- assert testdir .run (sys .executable , "runner.py" ).ret == 0
802
+ assert testdir .run (sys .executable , "runner.py" , timeout = timeout ).ret == 0
801
803
802
804
803
805
def test_blockon_in_hook_with_asyncio (testdir , cmd_opts , request ):
@@ -829,7 +831,7 @@ def test_succeed():
829
831
return d
830
832
"""
831
833
testdir .makepyfile (test_file )
832
- rr = testdir .run (sys .executable , "-m" , "pytest" , "-v" , * cmd_opts )
834
+ rr = testdir .run (sys .executable , "-m" , "pytest" , "-v" , * cmd_opts , timeout = timeout )
833
835
assert_outcomes (rr , {"passed" : 1 })
834
836
835
837
@@ -854,7 +856,7 @@ def test_succeed():
854
856
pass
855
857
"""
856
858
testdir .makepyfile (test_file )
857
- rr = testdir .run (sys .executable , "-m" , "pytest" , "-v" , * cmd_opts )
859
+ rr = testdir .run (sys .executable , "-m" , "pytest" , "-v" , * cmd_opts , timeout = timeout )
858
860
assert "WrongReactorAlreadyInstalledError" in rr .stderr .str ()
859
861
860
862
@@ -902,5 +904,5 @@ def test_second(foo):
902
904
check_me = 3
903
905
"""
904
906
testdir .makepyfile (test_file )
905
- rr = testdir .run (sys .executable , "-m" , "pytest" , "-v" , * cmd_opts )
907
+ rr = testdir .run (sys .executable , "-m" , "pytest" , "-v" , * cmd_opts , timeout = timeout )
906
908
assert_outcomes (rr , {"passed" : 2 })
0 commit comments