Merge branch '21666-provision-test-improvement'

[arvados.git] / services / ws / permission_test.go

diff --git a/services/ws/permission_test.go b/services/ws/permission_test.go
index 3ddde6f7b6d3a62e9dd0d4d27b95c92a70078112..2a22eae609d4c154d5ccff8174ee316662b7da4c 100644 (file)
--- a/services/ws/permission_test.go
+++ b/services/ws/permission_test.go
@@ -2,11 +2,13 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-package main
+package ws
 
 import (
-       "git.curoverse.com/arvados.git/sdk/go/arvados"
-       "git.curoverse.com/arvados.git/sdk/go/arvadostest"
+       "context"
+
+       "git.arvados.org/arvados.git/sdk/go/arvados"
+       "git.arvados.org/arvados.git/sdk/go/arvadostest"
        check "gopkg.in/check.v1"
 )
 
@@ -15,26 +17,30 @@ var _ = check.Suite(&permSuite{})
 type permSuite struct{}
 
 func (s *permSuite) TestCheck(c *check.C) {
-       pc := newPermChecker(*(arvados.NewClientFromEnv())).(*cachingPermChecker)
+       client := arvados.NewClientFromEnv()
+       // Disable auto-retry
+       client.Timeout = 0
+
+       pc := newPermChecker(client).(*cachingPermChecker)
        setToken := func(label, token string) {
                c.Logf("...%s token %q", label, token)
                pc.SetToken(token)
        }
        wantError := func(uuid string) {
                c.Log(uuid)
-               ok, err := pc.Check(uuid)
+               ok, err := pc.Check(context.Background(), uuid)
                c.Check(ok, check.Equals, false)
                c.Check(err, check.NotNil)
        }
        wantYes := func(uuid string) {
                c.Log(uuid)
-               ok, err := pc.Check(uuid)
+               ok, err := pc.Check(context.Background(), uuid)
                c.Check(ok, check.Equals, true)
                c.Check(err, check.IsNil)
        }
        wantNo := func(uuid string) {
                c.Log(uuid)
-               ok, err := pc.Check(uuid)
+               ok, err := pc.Check(context.Background(), uuid)
                c.Check(ok, check.Equals, false)
                c.Check(err, check.IsNil)
        }
@@ -67,7 +73,7 @@ func (s *permSuite) TestCheck(c *check.C) {
        pc.SetToken(arvadostest.ActiveToken)
 
        c.Log("...network error")
-       pc.Client.APIHost = "127.0.0.1:discard"
+       pc.ac.APIHost = "127.0.0.1:9"
        wantError(arvadostest.UserAgreementCollection)
        wantError(arvadostest.FooBarDirCollection)