mirror of
https://github.com/appleboy/drone-ssh.git
synced 2025-05-09 18:23:21 +08:00
chore(log): remove prefix out: and err: prefix (#287)
- Simplify log output by removing "out:" and "err:" prefixes in `plugin.go` - Update test expectations to match the new log output format Signed-off-by: appleboy <appleboy.tw@gmail.com>
This commit is contained in:
parent
2c52afb7fd
commit
883f947b4f
@ -145,11 +145,11 @@ loop:
|
|||||||
break loop
|
break loop
|
||||||
case outline := <-stdoutChan:
|
case outline := <-stdoutChan:
|
||||||
if outline != "" {
|
if outline != "" {
|
||||||
p.log(host, "out:", outline)
|
p.log(host, outline)
|
||||||
}
|
}
|
||||||
case errline := <-stderrChan:
|
case errline := <-stderrChan:
|
||||||
if errline != "" {
|
if errline != "" {
|
||||||
p.log(host, "err:", errline)
|
p.log(host, errline)
|
||||||
}
|
}
|
||||||
case err = <-errChan:
|
case err = <-errChan:
|
||||||
}
|
}
|
||||||
|
@ -365,17 +365,17 @@ func TestCommandOutput(t *testing.T) {
|
|||||||
whoami
|
whoami
|
||||||
uname
|
uname
|
||||||
localhost: ======END======
|
localhost: ======END======
|
||||||
localhost: out: /home/drone-scp
|
localhost: /home/drone-scp
|
||||||
localhost: out: drone-scp
|
localhost: drone-scp
|
||||||
localhost: out: Linux
|
localhost: Linux
|
||||||
127.0.0.1: ======CMD======
|
127.0.0.1: ======CMD======
|
||||||
127.0.0.1: pwd
|
127.0.0.1: pwd
|
||||||
whoami
|
whoami
|
||||||
uname
|
uname
|
||||||
127.0.0.1: ======END======
|
127.0.0.1: ======END======
|
||||||
127.0.0.1: out: /home/drone-scp
|
127.0.0.1: /home/drone-scp
|
||||||
127.0.0.1: out: drone-scp
|
127.0.0.1: drone-scp
|
||||||
127.0.0.1: out: Linux
|
127.0.0.1: Linux
|
||||||
`
|
`
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -444,7 +444,7 @@ func TestFingerprint(t *testing.T) {
|
|||||||
var (
|
var (
|
||||||
buffer bytes.Buffer
|
buffer bytes.Buffer
|
||||||
expected = `
|
expected = `
|
||||||
out: drone-scp
|
drone-scp
|
||||||
`
|
`
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -475,7 +475,7 @@ func TestScriptStopWithMultipleHostAndSyncMode(t *testing.T) {
|
|||||||
var (
|
var (
|
||||||
buffer bytes.Buffer
|
buffer bytes.Buffer
|
||||||
expected = `
|
expected = `
|
||||||
err: mkdir: can't create directory 'a/b/c': No such file or directory
|
mkdir: can't create directory 'a/b/c': No such file or directory
|
||||||
`
|
`
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -506,7 +506,7 @@ func TestScriptStop(t *testing.T) {
|
|||||||
var (
|
var (
|
||||||
buffer bytes.Buffer
|
buffer bytes.Buffer
|
||||||
expected = `
|
expected = `
|
||||||
err: mkdir: can't create directory 'a/b/c': No such file or directory
|
mkdir: can't create directory 'a/b/c': No such file or directory
|
||||||
`
|
`
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -536,8 +536,8 @@ func TestNoneScriptStop(t *testing.T) {
|
|||||||
var (
|
var (
|
||||||
buffer bytes.Buffer
|
buffer bytes.Buffer
|
||||||
expected = `
|
expected = `
|
||||||
err: mkdir: can't create directory 'a/b/c': No such file or directory
|
mkdir: can't create directory 'a/b/c': No such file or directory
|
||||||
err: mkdir: can't create directory 'd/e/f': No such file or directory
|
mkdir: can't create directory 'd/e/f': No such file or directory
|
||||||
`
|
`
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -584,13 +584,13 @@ func TestEnvOutput(t *testing.T) {
|
|||||||
export ENV_6='test"'
|
export ENV_6='test"'
|
||||||
export ENV_7='test,!#;?.@$~'\''"'
|
export ENV_7='test,!#;?.@$~'\''"'
|
||||||
======END======
|
======END======
|
||||||
out: [test]
|
[test]
|
||||||
out: [test test]
|
[test test]
|
||||||
out: [test ]
|
[test ]
|
||||||
out: [ test test ]
|
[ test test ]
|
||||||
out: [test']
|
[test']
|
||||||
out: [test"]
|
[test"]
|
||||||
out: [test,!#;?.@$~'"]
|
[test,!#;?.@$~'"]
|
||||||
`
|
`
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -719,8 +719,8 @@ func TestUseInsecureCipher(t *testing.T) {
|
|||||||
var (
|
var (
|
||||||
buffer bytes.Buffer
|
buffer bytes.Buffer
|
||||||
expected = `
|
expected = `
|
||||||
err: mkdir: can't create directory 'a/b/c': No such file or directory
|
mkdir: can't create directory 'a/b/c': No such file or directory
|
||||||
err: mkdir: can't create directory 'd/e/f': No such file or directory
|
mkdir: can't create directory 'd/e/f': No such file or directory
|
||||||
`
|
`
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -871,9 +871,9 @@ func TestAllEnvs(t *testing.T) {
|
|||||||
var (
|
var (
|
||||||
buffer bytes.Buffer
|
buffer bytes.Buffer
|
||||||
expected = `
|
expected = `
|
||||||
out: [foobar]
|
[foobar]
|
||||||
out: [foobar]
|
[foobar]
|
||||||
out: [foobar]
|
[foobar]
|
||||||
`
|
`
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -915,7 +915,7 @@ func TestSudoCommand(t *testing.T) {
|
|||||||
var (
|
var (
|
||||||
buffer bytes.Buffer
|
buffer bytes.Buffer
|
||||||
expected = `
|
expected = `
|
||||||
out: root
|
root
|
||||||
`
|
`
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -942,7 +942,7 @@ func TestCommandWithIPv6(t *testing.T) {
|
|||||||
var (
|
var (
|
||||||
buffer bytes.Buffer
|
buffer bytes.Buffer
|
||||||
expected = `
|
expected = `
|
||||||
out: drone-scp
|
drone-scp
|
||||||
`
|
`
|
||||||
)
|
)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user