projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
2411: Add copyright notices to everything.
[arvados.git]
/
sdk
/
go
/
crunchrunner
/
crunchrunner_test.go
diff --git
a/sdk/go/crunchrunner/crunchrunner_test.go
b/sdk/go/crunchrunner/crunchrunner_test.go
index f4c8193696104be204b525b20a8a57ef01e13082..f2827c6a3577c2793a24e7921ae33869533b6bc0 100644
(file)
--- a/
sdk/go/crunchrunner/crunchrunner_test.go
+++ b/
sdk/go/crunchrunner/crunchrunner_test.go
@@
-1,8
+1,10
@@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: Apache-2.0
+
package main
import (
package main
import (
- "git.curoverse.com/arvados.git/sdk/go/arvadosclient"
- . "gopkg.in/check.v1"
"io"
"io/ioutil"
"log"
"io"
"io/ioutil"
"log"
@@
-10,6
+12,9
@@
import (
"syscall"
"testing"
"time"
"syscall"
"testing"
"time"
+
+ "git.curoverse.com/arvados.git/sdk/go/arvadosclient"
+ . "gopkg.in/check.v1"
)
// Gocheck boilerplate
)
// Gocheck boilerplate
@@
-53,7
+58,7
@@
func (s *TestSuite) TestSimpleRun(c *C) {
"zzzz-ot0gb-111111111111111",
tmpdir,
"",
"zzzz-ot0gb-111111111111111",
tmpdir,
"",
- Job{Script
_p
arameters: Tasks{[]TaskDef{{
+ Job{Script
P
arameters: Tasks{[]TaskDef{{
Command: []string{"echo", "foo"}}}}},
Task{Sequence: 0})
c.Check(err, IsNil)
Command: []string{"echo", "foo"}}}}},
Task{Sequence: 0})
c.Check(err, IsNil)
@@
-88,7
+93,7
@@
func (s *TestSuite) TestSimpleRunSubtask(c *C) {
"zzzz-ot0gb-111111111111111",
tmpdir,
"",
"zzzz-ot0gb-111111111111111",
tmpdir,
"",
- Job{Script
_p
arameters: Tasks{[]TaskDef{
+ Job{Script
P
arameters: Tasks{[]TaskDef{
{Command: []string{"echo", "bar"}},
{Command: []string{"echo", "foo"}}}}},
Task{Parameters: TaskDef{
{Command: []string{"echo", "bar"}},
{Command: []string{"echo", "foo"}}}}},
Task{Parameters: TaskDef{
@@
-118,7
+123,7
@@
func (s *TestSuite) TestRedirect(c *C) {
"zzzz-ot0gb-111111111111111",
tmpdir,
"",
"zzzz-ot0gb-111111111111111",
tmpdir,
"",
- Job{Script
_p
arameters: Tasks{[]TaskDef{{
+ Job{Script
P
arameters: Tasks{[]TaskDef{{
Command: []string{"cat"},
Stdout: "output.txt",
Stdin: tmpfile.Name()}}}},
Command: []string{"cat"},
Stdout: "output.txt",
Stdin: tmpfile.Name()}}}},
@@
-140,7
+145,7
@@
func (s *TestSuite) TestEnv(c *C) {
"zzzz-ot0gb-111111111111111",
tmpdir,
"",
"zzzz-ot0gb-111111111111111",
tmpdir,
"",
- Job{Script
_p
arameters: Tasks{[]TaskDef{{
+ Job{Script
P
arameters: Tasks{[]TaskDef{{
Command: []string{"/bin/sh", "-c", "echo $BAR"},
Stdout: "output.txt",
Env: map[string]string{"BAR": "foo"}}}}},
Command: []string{"/bin/sh", "-c", "echo $BAR"},
Stdout: "output.txt",
Env: map[string]string{"BAR": "foo"}}}}},
@@
-161,7
+166,7
@@
func (s *TestSuite) TestEnvSubstitute(c *C) {
"zzzz-ot0gb-111111111111111",
tmpdir,
"foo\n",
"zzzz-ot0gb-111111111111111",
tmpdir,
"foo\n",
- Job{Script
_p
arameters: Tasks{[]TaskDef{{
+ Job{Script
P
arameters: Tasks{[]TaskDef{{
Command: []string{"/bin/sh", "-c", "echo $BAR"},
Stdout: "output.txt",
Env: map[string]string{"BAR": "$(task.keep)"}}}}},
Command: []string{"/bin/sh", "-c", "echo $BAR"},
Stdout: "output.txt",
Env: map[string]string{"BAR": "$(task.keep)"}}}}},
@@
-182,7
+187,7
@@
func (s *TestSuite) TestEnvReplace(c *C) {
"zzzz-ot0gb-111111111111111",
tmpdir,
"",
"zzzz-ot0gb-111111111111111",
tmpdir,
"",
- Job{Script
_p
arameters: Tasks{[]TaskDef{{
+ Job{Script
P
arameters: Tasks{[]TaskDef{{
Command: []string{"/bin/sh", "-c", "echo $PATH"},
Stdout: "output.txt",
Env: map[string]string{"PATH": "foo"}}}}},
Command: []string{"/bin/sh", "-c", "echo $PATH"},
Stdout: "output.txt",
Env: map[string]string{"PATH": "foo"}}}}},
@@
-211,14
+216,14
@@
func (t SubtaskTestClient) Update(resourceType string, uuid string, parameters a
func (s *TestSuite) TestScheduleSubtask(c *C) {
api := SubtaskTestClient{c, []Task{
func (s *TestSuite) TestScheduleSubtask(c *C) {
api := SubtaskTestClient{c, []Task{
- {Job
_uuid
: "zzzz-8i9sb-111111111111111",
- Created
_by_job_task_uuid
: "zzzz-ot0gb-111111111111111",
- Sequence:
1,
+ {Job
UUID
: "zzzz-8i9sb-111111111111111",
+ Created
ByJobTaskUUID
: "zzzz-ot0gb-111111111111111",
+ Sequence: 1,
Parameters: TaskDef{
Command: []string{"echo", "bar"}}},
Parameters: TaskDef{
Command: []string{"echo", "bar"}}},
- {Job
_uuid
: "zzzz-8i9sb-111111111111111",
- Created
_by_job_task_uuid
: "zzzz-ot0gb-111111111111111",
- Sequence:
1,
+ {Job
UUID
: "zzzz-8i9sb-111111111111111",
+ Created
ByJobTaskUUID
: "zzzz-ot0gb-111111111111111",
+ Sequence: 1,
Parameters: TaskDef{
Command: []string{"echo", "foo"}}}},
0}
Parameters: TaskDef{
Command: []string{"echo", "foo"}}}},
0}
@@
-233,7
+238,7
@@
func (s *TestSuite) TestScheduleSubtask(c *C) {
"zzzz-ot0gb-111111111111111",
tmpdir,
"",
"zzzz-ot0gb-111111111111111",
tmpdir,
"",
- Job{Script
_p
arameters: Tasks{[]TaskDef{
+ Job{Script
P
arameters: Tasks{[]TaskDef{
{Command: []string{"echo", "bar"}},
{Command: []string{"echo", "foo"}}}}},
Task{Sequence: 0})
{Command: []string{"echo", "bar"}},
{Command: []string{"echo", "foo"}}}}},
Task{Sequence: 0})
@@
-252,7
+257,7
@@
func (s *TestSuite) TestRunFail(c *C) {
"zzzz-ot0gb-111111111111111",
tmpdir,
"",
"zzzz-ot0gb-111111111111111",
tmpdir,
"",
- Job{Script
_p
arameters: Tasks{[]TaskDef{{
+ Job{Script
P
arameters: Tasks{[]TaskDef{{
Command: []string{"/bin/sh", "-c", "exit 1"}}}}},
Task{Sequence: 0})
c.Check(err, FitsTypeOf, PermFail{})
Command: []string{"/bin/sh", "-c", "exit 1"}}}}},
Task{Sequence: 0})
c.Check(err, FitsTypeOf, PermFail{})
@@
-269,7
+274,7
@@
func (s *TestSuite) TestRunSuccessCode(c *C) {
"zzzz-ot0gb-111111111111111",
tmpdir,
"",
"zzzz-ot0gb-111111111111111",
tmpdir,
"",
- Job{Script
_p
arameters: Tasks{[]TaskDef{{
+ Job{Script
P
arameters: Tasks{[]TaskDef{{
Command: []string{"/bin/sh", "-c", "exit 1"},
SuccessCodes: []int{0, 1}}}}},
Task{Sequence: 0})
Command: []string{"/bin/sh", "-c", "exit 1"},
SuccessCodes: []int{0, 1}}}}},
Task{Sequence: 0})
@@
-287,7
+292,7
@@
func (s *TestSuite) TestRunFailCode(c *C) {
"zzzz-ot0gb-111111111111111",
tmpdir,
"",
"zzzz-ot0gb-111111111111111",
tmpdir,
"",
- Job{Script
_p
arameters: Tasks{[]TaskDef{{
+ Job{Script
P
arameters: Tasks{[]TaskDef{{
Command: []string{"/bin/sh", "-c", "exit 0"},
PermanentFailCodes: []int{0, 1}}}}},
Task{Sequence: 0})
Command: []string{"/bin/sh", "-c", "exit 0"},
PermanentFailCodes: []int{0, 1}}}}},
Task{Sequence: 0})
@@
-305,7
+310,7
@@
func (s *TestSuite) TestRunTempFailCode(c *C) {
"zzzz-ot0gb-111111111111111",
tmpdir,
"",
"zzzz-ot0gb-111111111111111",
tmpdir,
"",
- Job{Script
_p
arameters: Tasks{[]TaskDef{{
+ Job{Script
P
arameters: Tasks{[]TaskDef{{
Command: []string{"/bin/sh", "-c", "exit 1"},
TemporaryFailCodes: []int{1}}}}},
Task{Sequence: 0})
Command: []string{"/bin/sh", "-c", "exit 1"},
TemporaryFailCodes: []int{1}}}}},
Task{Sequence: 0})
@@
-329,7
+334,7
@@
func (s *TestSuite) TestVwd(c *C) {
"zzzz-ot0gb-111111111111111",
tmpdir,
"",
"zzzz-ot0gb-111111111111111",
tmpdir,
"",
- Job{Script
_p
arameters: Tasks{[]TaskDef{{
+ Job{Script
P
arameters: Tasks{[]TaskDef{{
Command: []string{"ls", "output.txt"},
Vwd: map[string]string{
"output.txt": tmpfile.Name()}}}}},
Command: []string{"ls", "output.txt"},
Vwd: map[string]string{
"output.txt": tmpfile.Name()}}}}},
@@
-361,7
+366,7
@@
func (s *TestSuite) TestSubstitutionStdin(c *C) {
"zzzz-ot0gb-111111111111111",
tmpdir,
keepmount,
"zzzz-ot0gb-111111111111111",
tmpdir,
keepmount,
- Job{Script
_p
arameters: Tasks{[]TaskDef{{
+ Job{Script
P
arameters: Tasks{[]TaskDef{{
Command: []string{"cat"},
Stdout: "output.txt",
Stdin: "$(task.keep)/file1.txt"}}}},
Command: []string{"cat"},
Stdout: "output.txt",
Stdin: "$(task.keep)/file1.txt"}}}},
@@
-389,7
+394,7
@@
func (s *TestSuite) TestSubstitutionCommandLine(c *C) {
"zzzz-ot0gb-111111111111111",
tmpdir,
keepmount,
"zzzz-ot0gb-111111111111111",
tmpdir,
keepmount,
- Job{Script
_p
arameters: Tasks{[]TaskDef{{
+ Job{Script
P
arameters: Tasks{[]TaskDef{{
Command: []string{"cat", "$(task.keep)/file1.txt"},
Stdout: "output.txt"}}}},
Task{Sequence: 0})
Command: []string{"cat", "$(task.keep)/file1.txt"},
Stdout: "output.txt"}}}},
Task{Sequence: 0})
@@
-417,7
+422,7
@@
func (s *TestSuite) TestSignal(c *C) {
"zzzz-ot0gb-111111111111111",
tmpdir,
"",
"zzzz-ot0gb-111111111111111",
tmpdir,
"",
- Job{Script
_p
arameters: Tasks{[]TaskDef{{
+ Job{Script
P
arameters: Tasks{[]TaskDef{{
Command: []string{"sleep", "4"}}}}},
Task{Sequence: 0})
c.Check(err, FitsTypeOf, PermFail{})
Command: []string{"sleep", "4"}}}}},
Task{Sequence: 0})
c.Check(err, FitsTypeOf, PermFail{})
@@
-437,7
+442,7
@@
func (s *TestSuite) TestQuoting(c *C) {
"zzzz-ot0gb-111111111111111",
tmpdir,
"",
"zzzz-ot0gb-111111111111111",
tmpdir,
"",
- Job{Script
_p
arameters: Tasks{[]TaskDef{{
+ Job{Script
P
arameters: Tasks{[]TaskDef{{
Command: []string{"echo", "foo"},
Stdout: "s ub:dir/:e vi\nl"}}}},
Task{Sequence: 0})
Command: []string{"echo", "foo"},
Stdout: "s ub:dir/:e vi\nl"}}}},
Task{Sequence: 0})
@@
-464,7
+469,7
@@
func (s *TestSuite) TestKeepTmp(c *C) {
"zzzz-ot0gb-111111111111111",
tmpdir,
"",
"zzzz-ot0gb-111111111111111",
tmpdir,
"",
- Job{Script
_p
arameters: Tasks{[]TaskDef{{
+ Job{Script
P
arameters: Tasks{[]TaskDef{{
Command: []string{"echo", "foo"},
KeepTmpOutput: true}}}},
Task{Sequence: 0})
Command: []string{"echo", "foo"},
KeepTmpOutput: true}}}},
Task{Sequence: 0})