Merge branch '21766-disk-cache-size'

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

diff --git a/lib/crunchrun/executor_test.go b/lib/crunchrun/executor_test.go
index e757f579fe957eff333892c2fc7a12de9fff82e2..3a91c7864113ce5b422c24d0a5a02ed690d51fdc 100644 (file)
--- a/lib/crunchrun/executor_test.go
+++ b/lib/crunchrun/executor_test.go
@@ -6,6 +6,7 @@ package crunchrun
 
 import (
        "bytes"
+       "context"
        "fmt"
        "io"
        "io/ioutil"
@@ -18,7 +19,6 @@ import (
        "git.arvados.org/arvados.git/lib/diagnostics"
        "git.arvados.org/arvados.git/sdk/go/arvados"
        "git.arvados.org/arvados.git/sdk/go/arvadostest"
-       "golang.org/x/net/context"
        . "gopkg.in/check.v1"
 )
 
@@ -134,6 +134,10 @@ func (s *executorSuite) TestExecCleanEnv(c *C) {
                        // 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)
+               case "SINGULARITY_NO_EVAL":
+                       // our singularity driver sets this to control
+                       // singularity behavior, and it gets passed
+                       // through to the container
                default:
                        got[kv[0]] = kv[1]
                }