3434TEST_TIMEOUT = 20 * 60
3535
3636
37+ def step_timeout (timeout ):
38+ # timeout is the regrtest timeout in seconds. If a test runs longer than
39+ # the timeout, it should be killed by faulthandler. Give 10 minutes to
40+ # faulthandler to kill the process. Tests should always be shorter than the
41+ # buildbot step timeout, unless faulthandler fails to kill the process.
42+ return timeout + 10 * 60
43+
44+
3745def regrtest_has_cleanup (branch ):
3846 return branch not in CUSTOM_BRANCH_NAME }
3947
@@ -97,8 +105,6 @@ def setup(self, parallel, branch, test_with_PTY=False, **kwargs):
97105 testopts .extend (("--junit-xml" , JUNIT_FILENAME ))
98106 # Timeout for the buildworker process
99107 self .test_timeout = self .test_timeout or TEST_TIMEOUT
100- # Timeout for faulthandler
101- faulthandler_timeout = self .test_timeout - 5 * 60
102108 if parallel :
103109 compile = ["make" , parallel , self .makeTarget ]
104110 testopts .append (parallel )
@@ -110,8 +116,8 @@ def setup(self, parallel, branch, test_with_PTY=False, **kwargs):
110116 "make" ,
111117 "buildbottest" ,
112118 "TESTOPTS=" + " " .join (testopts ) + " ${BUILDBOT_TESTOPTS}" ,
113- "TESTPYTHONOPTS=" + self .interpreterFlags ,
114- "TESTTIMEOUT=" + str ( faulthandler_timeout ) ,
119+ f "TESTPYTHONOPTS={ self .interpreterFlags } "
120+ f "TESTTIMEOUT={ self . test_timeout } "
115121 ]
116122
117123 self .addStep (Compile (command = compile ,
@@ -127,15 +133,13 @@ def setup(self, parallel, branch, test_with_PTY=False, **kwargs):
127133 ** oot_kwargs
128134 )
129135 )
130- self .addStep (
131- Test (
132- command = test ,
133- timeout = self .test_timeout ,
134- usePTY = test_with_PTY ,
135- env = self .test_environ ,
136- ** oot_kwargs
137- )
138- )
136+ self .addStep (Test (
137+ command = test ,
138+ timeout = step_timeout (self .test_timeout ),
139+ usePTY = test_with_PTY ,
140+ env = self .test_environ ,
141+ ** oot_kwargs
142+ ))
139143 if branch not in "3" ,) and not has_option ("-R" , self .testFlags ):
140144 filename = JUNIT_FILENAME
141145 if self .build_out_of_tree :
@@ -202,7 +206,7 @@ def setup(self, parallel, branch, test_with_PTY=False, **kwargs):
202206 branch = MAIN_BRANCH_VERSION
203207 elif branch == "custom" :
204208 branch = "3"
205- installed_python = "./target/bin/python%s" % branch
209+ installed_python = f "./target/bin/python{ branch } "
206210 self .addStep (
207211 Configure (
208212 command = ["./configure" , "--prefix" , "$(PWD)/target" ]
@@ -213,11 +217,8 @@ def setup(self, parallel, branch, test_with_PTY=False, **kwargs):
213217 compile = ["make" , self .makeTarget ]
214218 install = ["make" , self .installTarget ]
215219 testopts = list (self .defaultTestOpts )
216- # Timeout for the buildworker process
217220 self .test_timeout = self .test_timeout or TEST_TIMEOUT
218- # Timeout for faulthandler
219- faulthandler_timeout = self .test_timeout - 5 * 60
220- testopts .append (f"--timeout={ faulthandler_timeout } )
221+ testopts .append (f"--timeout={ self .test_timeout } )
221222 if parallel :
222223 compile = ["make" , parallel , self .makeTarget ]
223224 install = ["make" , parallel , self .installTarget ]
@@ -241,9 +242,11 @@ def setup(self, parallel, branch, test_with_PTY=False, **kwargs):
241242 warnOnFailure = True ,
242243 )
243244 )
244- self .addStep (
245- Test (command = test , timeout = self .test_timeout , usePTY = test_with_PTY )
246- )
245+ self .addStep (Test (
246+ command = test ,
247+ timeout = step_timeout (self .test_timeout ),
248+ usePTY = test_with_PTY ,
249+ ))
247250 self .addStep (Uninstall ())
248251 self .addStep (Clean ())
249252
@@ -543,8 +546,11 @@ def setup(self, parallel, branch, **kwargs):
543546 )
544547 )
545548 timeout = self .test_timeout if self .test_timeout else TEST_TIMEOUT
546- test_command .extend (("--timeout" , timeout - (5 * 60 )))
547- self .addStep (Test (command = test_command , timeout = timeout ))
549+ test_command .extend (("--timeout" , str (timeout )))
550+ self .addStep (Test (
551+ command = test_command ,
552+ timeout = step_timeout (self .test_timeout ),
553+ ))
548554 if branch not in "3" ,) and not has_option ("-R" , self .testFlags ):
549555 self .addStep (UploadTestResults (branch ))
550556 self .addStep (Clean (command = clean_command ))
@@ -721,17 +727,14 @@ def setup(self, parallel, branch, test_with_PTY=False, **kwargs):
721727 if branch in BRANCH_WITH_FAIL_RERUN :
722728 testopts .append ("--fail-rerun" )
723729
724- # Timeout for the buildworker process
725730 self .test_timeout = self .test_timeout or TEST_TIMEOUT
726- # Timeout for faulthandler
727- faulthandler_timeout = self .test_timeout - 5 * 60
728731
729732 test = [
730733 "make" ,
731734 "buildbottest" ,
732735 "TESTOPTS=" + " " .join (testopts ) + " ${BUILDBOT_TESTOPTS}" ,
733- "TESTPYTHONOPTS=" + self .interpreterFlags ,
734- "TESTTIMEOUT=" + str ( faulthandler_timeout ) ,
736+ f "TESTPYTHONOPTS={ self .interpreterFlags } "
737+ f "TESTTIMEOUT={ self . test_timeout } "
735738 ]
736739
737740 if parallel :
@@ -757,15 +760,13 @@ def setup(self, parallel, branch, test_with_PTY=False, **kwargs):
757760 workdir = oot_host_path ,
758761 )
759762 )
760- self .addStep (
761- Test (
762- command = test ,
763- timeout = self .test_timeout ,
764- usePTY = test_with_PTY ,
765- env = self .test_environ ,
766- workdir = oot_host_path ,
767- )
768- )
763+ self .addStep (Test (
764+ command = test ,
765+ timeout = step_timeout (self .test_timeout ),
766+ usePTY = test_with_PTY ,
767+ env = self .test_environ ,
768+ workdir = oot_host_path ,
769+ ))
769770 if branch not in "3" ,) and not has_option ("-R" , self .testFlags ):
770771 filename = os .path .join (oot_host_path , JUNIT_FILENAME )
771772 self .addStep (UploadTestResults (branch , filename = filename ))
0 commit comments