19094: Note docker/singularity/arv-mount versions in container log.

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

diff --git a/lib/crunchrun/executor_test.go b/lib/crunchrun/executor_test.go
index 2156ea2d2305a237e0c60199e879f90403197e48..3301a6e63be2d5a9210649268efbcf9b08eff204 100644 (file)
--- a/lib/crunchrun/executor_test.go
+++ b/lib/crunchrun/executor_test.go
@@ -13,12 +13,11 @@ import (
        "strings"
        "time"
 
+       "git.arvados.org/arvados.git/sdk/go/arvados"
        "golang.org/x/net/context"
        . "gopkg.in/check.v1"
 )
 
-var _ = Suite(&dockerSuite{})
-
 func busyboxDockerImage(c *C) string {
        fnm := "busybox_uclibc.tar"
        cachedir := c.MkDir()
@@ -72,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)
 }
 
@@ -81,12 +80,29 @@ func (s *executorSuite) TearDownTest(c *C) {
 }
 
 func (s *executorSuite) TestExecTrivialContainer(c *C) {
+       c.Logf("Using container runtime: %s", s.executor.Runtime())
        s.spec.Command = []string{"echo", "ok"}
        s.checkRun(c, 0)
        c.Check(s.stdout.String(), Equals, "ok\n")
        c.Check(s.stderr.String(), Equals, "")
 }
 
+func (s *executorSuite) TestExitStatus(c *C) {
+       s.spec.Command = []string{"false"}
+       s.checkRun(c, 1)
+}
+
+func (s *executorSuite) TestSignalExitStatus(c *C) {
+       if _, isdocker := s.executor.(*dockerExecutor); isdocker {
+               // It's not quite this easy to make busybox kill
+               // itself in docker where it's pid 1.
+               c.Skip("kill -9 $$ doesn't work on busybox with pid=1 in docker")
+               return
+       }
+       s.spec.Command = []string{"sh", "-c", "kill -9 $$"}
+       s.checkRun(c, 0x80+9)
+}
+
 func (s *executorSuite) TestExecStop(c *C) {
        s.spec.Command = []string{"sh", "-c", "sleep 10; echo ok"}
        err := s.executor.Create(s.spec)
@@ -121,8 +137,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]
                }
@@ -143,6 +161,13 @@ func (s *executorSuite) TestExecEnableNetwork(c *C) {
        }
 }
 
+func (s *executorSuite) TestExecWorkingDir(c *C) {
+       s.spec.WorkingDir = "/tmp"
+       s.spec.Command = []string{"sh", "-c", "pwd"}
+       s.checkRun(c, 0)
+       c.Check(s.stdout.String(), Equals, "/tmp\n")
+}
+
 func (s *executorSuite) TestExecStdoutStderr(c *C) {
        s.spec.Command = []string{"sh", "-c", "echo foo; echo -n bar >&2; echo baz; echo waz >&2"}
        s.checkRun(c, 0)