20690: Merge branch 'main' into 20690-remove-wb1

[arvados.git] / lib / install / deps_test.go

diff --git a/lib/install/deps_test.go b/lib/install/deps_test.go
index a19bcb05f83fbfc82d64429ae49600575cf3dfdc..b9274b425ca6b971653e8e2b817708b6d022c7cc 100644 (file)
--- a/lib/install/deps_test.go
+++ b/lib/install/deps_test.go
@@ -6,25 +6,17 @@
 // Depending on host/network speed, Go's default 10m test timeout
 // might be too short; recommend "go test -timeout 20m -tags docker".
 //
+//go:build docker
 // +build docker
 
 package install
 
 import (
        "os"
-       "testing"
 
        "gopkg.in/check.v1"
 )
 
-func Test(t *testing.T) {
-       check.TestingT(t)
-}
-
-var _ = check.Suite(&Suite{})
-
-type Suite struct{}
-
 func (*Suite) TestInstallDeps(c *check.C) {
        tmp := c.MkDir()
        script := `
@@ -36,11 +28,13 @@ docker run -i --rm --workdir /arvados \
        -v ${tmp}/arvados-server:/arvados-server:ro \
        -v ${sourcepath}:/arvados:ro \
        -v /arvados/services/api/.bundle \
-       -v /arvados/apps/workbench/.bundle \
+       -v /arvados/services/api/tmp \
        --env http_proxy \
        --env https_proxy \
-       debian:10 \
-       bash -c "/arvados-server install -type test && /arvados-server boot -type test -config doc/examples/config/zzzzz.yml -own-temporary-database -shutdown -timeout 9m"
+       debian:11 \
+       bash -c "/arvados-server install -type test &&
+           git config --global --add safe.directory /arvados &&
+           /arvados-server boot -type test -config doc/examples/config/zzzzz.yml -own-temporary-database -shutdown -timeout 9m"
 `
-       c.Check(runBash(script, os.Stdout, os.Stderr), check.IsNil)
+       c.Check((&installCommand{}).runBash(script, os.Stdout, os.Stderr), check.IsNil)
 }