diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2020-06-19 22:56:22 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2020-06-19 22:56:22 +0000 |
| commit | c3ad661174e3f770b100812c6075f2ca092e9c2a (patch) | |
| tree | 3dfcf540eb4c49e05d1b97de4492f9e00bec4db0 /user/gitlab-runner/tests.patch | |
| parent | b39942321d371aaa6fa453bf06cb55089bbe7444 (diff) | |
| parent | c4d87ab64fb1a3a1a89e6e0cb8d4b7291e511c1d (diff) | |
| download | packages-c3ad661174e3f770b100812c6075f2ca092e9c2a.tar.gz packages-c3ad661174e3f770b100812c6075f2ca092e9c2a.tar.bz2 packages-c3ad661174e3f770b100812c6075f2ca092e9c2a.tar.xz packages-c3ad661174e3f770b100812c6075f2ca092e9c2a.zip | |
Merge branch 'gitlab-runner' into 'master'
user/gitlab-runner: new package
See merge request adelie/packages!467
Diffstat (limited to 'user/gitlab-runner/tests.patch')
| -rw-r--r-- | user/gitlab-runner/tests.patch | 63 |
1 files changed, 63 insertions, 0 deletions
diff --git a/user/gitlab-runner/tests.patch b/user/gitlab-runner/tests.patch new file mode 100644 index 000000000..1aff6c653 --- /dev/null +++ b/user/gitlab-runner/tests.patch @@ -0,0 +1,63 @@ +--- gitlab-runner-v12.1.0/shells/bash_test.go 2019-07-19 12:13:32.000000000 +0000 ++++ gitlab-runner-v12.1.0/shells/bash_test.go 2020-04-27 00:07:06.763360621 +0000 +@@ -10,12 +10,12 @@ func TestBash_CommandShellEscapes(t *tes + writer := &BashWriter{} + writer.Command("foo", "x&(y)") + +- assert.Equal(t, `$'foo' "x&(y)"`+"\n", writer.String()) ++ assert.Equal(t, `'foo' "x&(y)"`+"\n", writer.String()) + } + + func TestBash_IfCmdShellEscapes(t *testing.T) { + writer := &BashWriter{} + writer.IfCmd("foo", "x&(y)") + +- assert.Equal(t, `if $'foo' "x&(y)" >/dev/null 2>/dev/null; then`+"\n", writer.String()) ++ assert.Equal(t, `if 'foo' "x&(y)" >/dev/null 2>/dev/null; then`+"\n", writer.String()) + } +--- gitlab-runner-v12.1.0/executors/shell/executor_shell_test.go 2019-07-19 12:13:32.000000000 +0000 ++++ gitlab-runner-v12.1.0/executors/shell/executor_shell_test.go 2020-04-27 00:01:12.813355024 +0000 +@@ -166,7 +166,7 @@ func TestBuildAbort(t *testing.T) { + defer abortTimer.Stop() + + err = runBuild(t, build) +- assert.EqualError(t, err, "aborted: interrupt") ++ assert.EqualError(t, err, "aborted: Interrupt") + }) + } + +--- gitlab-runner-v12.1.0/executors/custom/executor_integration_test.go 2019-07-19 12:13:32.000000000 +0000 ++++ gitlab-runner-v12.1.0/executors/custom/executor_integration_test.go 2020-04-27 00:00:42.493354545 +0000 +@@ -234,7 +234,7 @@ func TestBuildAbort(t *testing.T) { + defer abortTimer.Stop() + + err = runBuild(t, build) +- assert.EqualError(t, err, "aborted: interrupt") ++ assert.EqualError(t, err, "aborted: Interrupt") + }) + } + +--- gitlab-runner-v12.1.0/helpers/shell_escape_test.go 2019-07-19 12:13:32.000000000 +0000 ++++ gitlab-runner-v12.1.0/helpers/shell_escape_test.go 2020-04-27 00:02:36.213356343 +0000 +@@ -24,8 +24,8 @@ func TestShellEscape(t *testing.T) { + in string + out string + }{ +- {"standard string", "$'standard string'"}, +- {"+\t\n\r&", "$'+\\t\\n\\r&'"}, ++ {"standard string", "'standard string'"}, ++ {"+\t\n\r&", "'+\t\n\r&'"}, + {"", "''"}, + } + +--- gitlab-runner-v12.1.0/common/build_test.go 2019-07-19 12:13:32.000000000 +0000 ++++ gitlab-runner-v12.1.0/common/build_test.go 2020-04-27 00:23:35.173376249 +0000 +@@ -1133,7 +1133,7 @@ func TestWaitForTerminal(t *testing.T) { + }, + jobTimeout: 3600, + waitForTerminalTimeout: time.Hour, +- expectedErr: "terminal disconnected by system signal: interrupt", ++ expectedErr: "terminal disconnected by system signal: Interrupt", + }, + { + name: "Terminal Disconnect", |