fix job start timeout

tests/conftest.py

@@ -8,14 +8,11 @@
 from time import sleep, time
 from uuid import uuid4
 
-# import logging
-# import http.client
-
 OWNER = 'Wonderland'
 REPOSITORIES_DIR = Path(__file__).resolve().parent / 'repositories'
 GITEA_GIT_BASE = 'http://thealice:thealice@localhost:3000'
 RUNNING_BUILD_TIMEOUT = 210
-START_BUILD_TIMEOUT = 60
+START_BUILD_TIMEOUT = 40
 FORK_ORG = 'test'
 GITEA_BASE = 'http://localhost:3000'
 GITEA_API_BASE = f'{GITEA_BASE}/api/v1'
@@ -73,14 +70,28 @@ def get(self, endpoint, **kwargs):
         return self.requester.get_url(f'{self.baseurl}{endpoint}', **kwargs)
 
     def find_in_last_build_console(self, job_path, string, start_job=True):
-        if start_job:
-            res = self.post(f'/job/{job_path}/build?delay=0')
-            assert res.status_code == 200 or res.status_code == 201
-
         if '/job/' in job_path:
             job_name = f'{job_path.split("/")[0]}/{job_path.split("/")[-1]}'
         else:
             job_name = job_path
+        if start_job:
+            res = self.post(f'/job/{job_path}/build?delay=0')
+            assert res.status_code == 200 or res.status_code == 201
+            start_time = time()
+            retried = False
+            while 1:
+                if True not in [job.is_queued_or_running() for name, job in self.get_jobs() if job_name in name]:
+                    if time() - start_time > START_BUILD_TIMEOUT:
+                        if not retried:
+                            retried = True
+                            res = self.post(f'/job/{job_path}/build?delay=0')
+                            assert res.status_code == 200 or res.status_code == 201
+                            start_time = time()
+                        else:
+                            break
+                    sleep(1)
+                    continue
+                break
 
         def search_last_build(job):
             start = time()
@@ -104,19 +115,15 @@ def search_last_build(job):
                 try:
                     last_build = job.get_last_build()
                 except NoBuildData:
-                    return False, ''
+                    return False, str(NoBuildData)
             if string in last_build.get_console():
                 return True, ''
             return False, last_build.get_console()
 
-        start_time = time()
-        while 1:
-            results = [search_last_build(job) for name, job in self.get_jobs()
-                       if job_name in name]
-            if [result for result, console in results if result]:
-                return True
-            if time() - start_time > START_BUILD_TIMEOUT:
-                break
+        results = [search_last_build(job) for name, job in self.get_jobs()
+                   if job_name in name]
+        if [result for result, console in results if result]:
+            return True
         print('--------------------------\n'.join([console for result, console in results if console]))
         return False