12630: Remove distinction between cubin/PTX hardware capabilities

[arvados.git] / lib / crunchrun / executor_test.go

diff --git a/lib/crunchrun/executor_test.go b/lib/crunchrun/executor_test.go
index 5934c57b6c5f90bf971664c614a8348fb18b9e50..08c7140add8245a39f029328d43ad1ff64114155 100644 (file)
--- a/lib/crunchrun/executor_test.go
+++ b/lib/crunchrun/executor_test.go
@@ -13,6 +13,7 @@ import (
        "strings"
        "time"
 
+       "git.arvados.org/arvados.git/sdk/go/arvados"
        "golang.org/x/net/context"
        . "gopkg.in/check.v1"
 )
@@ -70,7 +71,7 @@ func (s *executorSuite) SetUpTest(c *C) {
                Stdout:      nopWriteCloser{&s.stdout},
                Stderr:      nopWriteCloser{&s.stderr},
        }
-       err := s.executor.LoadImage(busyboxDockerImage(c))
+       err := s.executor.LoadImage("", busyboxDockerImage(c), arvados.Container{}, "", nil)
        c.Assert(err, IsNil)
 }
 
@@ -119,8 +120,10 @@ func (s *executorSuite) TestExecCleanEnv(c *C) {
                        // docker sets these by itself
                case "LD_LIBRARY_PATH", "SINGULARITY_NAME", "PWD", "LANG", "SHLVL", "SINGULARITY_INIT", "SINGULARITY_CONTAINER":
                        // singularity sets these by itself (cf. https://sylabs.io/guides/3.5/user-guide/environment_and_metadata.html)
-               case "PROMPT_COMMAND", "PS1", "SINGULARITY_APPNAME":
-                       // singularity also sets these by itself (as of v3.5.2)
+               case "SINGULARITY_APPNAME":
+                       // singularity also sets this by itself (v3.5.2, but not v3.7.4)
+               case "PROMPT_COMMAND", "PS1", "SINGULARITY_BIND", "SINGULARITY_COMMAND", "SINGULARITY_ENVIRONMENT":
+                       // singularity also sets these by itself (v3.7.4)
                default:
                        got[kv[0]] = kv[1]
                }