summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
3fa6aa4)
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>
c.Skip("skipping docker tests in short mode")
} else if _, err := exec.Command("docker", "info").CombinedOutput(); err != nil {
c.Skip("skipping docker tests because docker is not available")
c.Skip("skipping docker tests in short mode")
} else if _, err := exec.Command("docker", "info").CombinedOutput(); err != nil {
c.Skip("skipping docker tests because docker is not available")
- } else if os.Getenv("ENABLE_DOCKER_TESTS") == "" {
- c.Skip("docker tests temporarily disabled if ENABLE_DOCKER_TESTS is not set, see https://dev.arvados.org/issues/15370#note-31")
if err := exec.Command("which", s.engine).Run(); err != nil {
c.Skip(fmt.Sprintf("%s: %s", s.engine, err))
}
if err := exec.Command("which", s.engine).Run(); err != nil {
c.Skip(fmt.Sprintf("%s: %s", s.engine, err))
}
- if s.engine == "docker" && os.Getenv("ENABLE_DOCKER_TESTS") == "" {
- c.Skip("docker tests temporarily disabled if ENABLE_DOCKER_TESTS is not set, see https://dev.arvados.org/issues/15370#note-31")
- }
s.cr.Command = []string{"sh", "-c", "cat /mnt/in/inputfile >/mnt/out/inputfile && cat /mnt/json >/mnt/out/json && ! touch /mnt/in/shouldbereadonly && mkdir /mnt/out/emptydir"}
s.setup(c)
s.cr.Command = []string{"sh", "-c", "cat /mnt/in/inputfile >/mnt/out/inputfile && cat /mnt/json >/mnt/out/json && ! touch /mnt/in/shouldbereadonly && mkdir /mnt/out/emptydir"}
s.setup(c)