21834: Restore timestamps in stdout.txt, stderr.txt.

[arvados.git] / lib / controller / handler_test.go

diff --git a/lib/controller/handler_test.go b/lib/controller/handler_test.go
index afc7ec93bf835d1dcbe081100b6c58682ba4dcf6..ff1d43da416965ad3023720c667486ab6f28d4cb 100644 (file)
--- a/lib/controller/handler_test.go
+++ b/lib/controller/handler_test.go
@@ -20,6 +20,7 @@ import (
        "testing"
        "time"
 
+       "git.arvados.org/arvados.git/lib/controller/dblock"
        "git.arvados.org/arvados.git/lib/controller/rpc"
        "git.arvados.org/arvados.git/sdk/go/arvados"
        "git.arvados.org/arvados.git/sdk/go/arvadostest"
@@ -65,6 +66,25 @@ func (s *HandlerSuite) SetUpTest(c *check.C) {
 
 func (s *HandlerSuite) TearDownTest(c *check.C) {
        s.cancel()
+
+       // Wait for dblocks to be released. Otherwise, a subsequent
+       // test might time out waiting to acquire them.
+       timeout := time.After(10 * time.Second)
+       for _, locker := range []*dblock.DBLocker{dblock.TrashSweep, dblock.ContainerLogSweep} {
+               ok := make(chan struct{})
+               go func() {
+                       if locker.Lock(context.Background(), s.handler.dbConnector.GetDB) {
+                               locker.Unlock()
+                       }
+                       close(ok)
+               }()
+               select {
+               case <-timeout:
+                       c.Log("timed out waiting for dblocks")
+                       c.Fail()
+               case <-ok:
+               }
+       }
 }
 
 func (s *HandlerSuite) TestConfigExport(c *check.C) {