summaryrefslogtreecommitdiffstats
path: root/integrations
diff options
context:
space:
mode:
authorzeripath <art27@cantab.net>2021-08-30 05:27:51 +0100
committerGitHub <noreply@github.com>2021-08-30 00:27:51 -0400
commit06b9d553bc02f88553ced9822c55ae901e2ac28e (patch)
tree9c942f976fd58d8e5ef7a466732f61aa296084cf /integrations
parentb0ff42988249648999acc76198a11a4eefddbb9a (diff)
downloadgitea-06b9d553bc02f88553ced9822c55ae901e2ac28e.tar.gz
gitea-06b9d553bc02f88553ced9822c55ae901e2ac28e.zip
Timeout on flush in testing (#16864)
* Timeout on flush in testing At the end of each test the queues are flushed. At present there is no limit on the length of time a flush can take which can lead to long flushes. However, if the CI task is cancelled we lose the log information as to where the long flush was taking place. This PR simply adds a default time limit of 2 minutes - at which point an error will be produced. This should allow us to more easily find the culprit. Signed-off-by: Andrew Thornton <art27@cantab.net> * return better error Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: 6543 <6543@obermui.de>
Diffstat (limited to 'integrations')
-rw-r--r--integrations/testlogger.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/integrations/testlogger.go b/integrations/testlogger.go
index 9498ad655b..ff408b314c 100644
--- a/integrations/testlogger.go
+++ b/integrations/testlogger.go
@@ -121,7 +121,7 @@ func PrintCurrentTest(t testing.TB, skip ...int) func() {
fmt.Fprintf(os.Stdout, "+++ %s ... still flushing after %v ...\n", t.Name(), slowFlush)
}
})
- if err := queue.GetManager().FlushAll(context.Background(), -1); err != nil {
+ if err := queue.GetManager().FlushAll(context.Background(), 2*time.Minute); err != nil {
t.Errorf("Flushing queues failed with error %v", err)
}
timer.Stop()