diff options
| author | zeripath <art27@cantab.net> | 2020-01-29 01:01:06 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-28 20:01:06 -0500 |
| commit | c01221e70fc71f5bcff5f699095fbcbfc1e2b4a3 (patch) | |
| tree | 4017848a786da2080e9a003a77bd40bd81625680 /integrations | |
| parent | 7c84dbca4f0f79dc90752105800a6964693283bd (diff) | |
| download | gitea-c01221e70fc71f5bcff5f699095fbcbfc1e2b4a3.tar.gz gitea-c01221e70fc71f5bcff5f699095fbcbfc1e2b4a3.zip | |
Queue: Make WorkerPools and Queues flushable (#10001)
* Make WorkerPools and Queues flushable
Adds Flush methods to Queues and the WorkerPool
Further abstracts the WorkerPool
Adds a final step to Flush the queues in the defer from PrintCurrentTest
Fixes an issue with Settings inheritance in queues
Signed-off-by: Andrew Thornton <art27@cantab.net>
* Change to for loop
* Add IsEmpty and begin just making the queues composed WorkerPools
* subsume workerpool into the queues and create a flushable interface
* Add manager command
* Move flushall to queue.Manager and add to testlogger
* As per @guillep2k
* as per @guillep2k
* Just make queues all implement flushable and clean up the wrapped queue flushes
* cope with no timeout
Co-authored-by: Lauris BH <lauris@nix.lv>
Diffstat (limited to 'integrations')
| -rw-r--r-- | integrations/testlogger.go | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/integrations/testlogger.go b/integrations/testlogger.go index 624abf3f81..b2ad257a9b 100644 --- a/integrations/testlogger.go +++ b/integrations/testlogger.go @@ -5,6 +5,7 @@ package integrations import ( + "context" "encoding/json" "fmt" "os" @@ -12,8 +13,10 @@ import ( "strings" "sync" "testing" + "time" "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/queue" ) var prefix string @@ -98,6 +101,9 @@ func PrintCurrentTest(t testing.TB, skip ...int) func() { } writerCloser.setT(&t) return func() { + if err := queue.GetManager().FlushAll(context.Background(), 20*time.Second); err != nil { + t.Errorf("Flushing queues failed with error %v", err) + } _ = writerCloser.Close() } } |