Merge branch '9964-output-glob-acr' refs #9964

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

diff --git a/lib/controller/handler_test.go b/lib/controller/handler_test.go
index 7d5e693f5b67a45019773adb98c09ebe31befd80..d5f644fdabb5d782650edc8e8b5f9e48aef40137 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) {
@@ -627,8 +647,7 @@ func (s *HandlerSuite) TestGetObjects(c *check.C) {
                        "api_client_authorization": {
                                "owner_uuid": "`+arvadostest.AdminUserUUID+`",
                                "created_by_ip_address": "::1",
-                               "last_used_by_ip_address": "::1",
-                               "default_owner_uuid": "`+arvadostest.AdminUserUUID+`"
+                               "last_used_by_ip_address": "::1"
                        }
                }`))
        req.Header.Set("Authorization", "Bearer "+arvadostest.SystemRootToken)
@@ -707,14 +726,14 @@ func (s *HandlerSuite) TestTrashSweep(c *check.C) {
 
 func (s *HandlerSuite) TestContainerLogSweep(c *check.C) {
        s.cluster.SystemRootToken = arvadostest.SystemRootToken
-       s.cluster.Containers.Logging.SweepInterval = arvados.Duration(time.Second / 10)
+       s.cluster.Collections.TrashSweepInterval = arvados.Duration(2 * time.Second)
        s.handler.CheckHealth()
        ctx := auth.NewContext(s.ctx, &auth.Credentials{Tokens: []string{arvadostest.ActiveTokenV2}})
        logentry, err := s.handler.federation.LogCreate(ctx, arvados.CreateOptions{Attrs: map[string]interface{}{
                "object_uuid": arvadostest.CompletedContainerUUID,
                "event_type":  "stderr",
                "properties": map[string]interface{}{
-                       "text": "test trash sweep\n",
+                       "text": "test container log sweep\n",
                },
        }})
        c.Assert(err, check.IsNil)