From 32acf0c7a5b98a35de7d3f739ad67a9120fed50b Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 15 Dec 2022 13:45:39 +0530
Subject: [PATCH] Fix test failures in srv module not being reported fully

---
 src/calibre/srv/tests/base.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/calibre/srv/tests/base.py b/src/calibre/srv/tests/base.py
index 7e9f907cf6..3da695acaa 100644
--- a/src/calibre/srv/tests/base.py
+++ b/src/calibre/srv/tests/base.py
@@ -34,13 +34,14 @@ class BaseTest(SimpleTest):
         for i in range(max_retries + 1):
             failures_before = len(result.failures)
             errors_before = len(result.errors)
-            super().run(result=result)
+            ret = super().run(result=result)
             if len(result.failures) == failures_before and len(result.errors) == errors_before:
-                return
+                return ret
             print(f'Retrying test {self._testMethodName} after failure/error')
-            q = result.failures if len(result.failures) > failures_before else result.errors
-            q.pop(-1)
-            time.sleep(1)
+            if i < max_retries:
+                q = result.failures if len(result.failures) > failures_before else result.errors
+                q.pop(-1)
+                time.sleep(1)
 
 
 class LibraryBaseTest(BaseTest):