diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-06-02 04:24:01 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-02 04:24:01 -0400 |
| commit | 2958aee08389aa5e89794f5e5b4f30ac3328d071 (patch) | |
| tree | 3fa18d5bf4759bfe6281725760141e3cc65f1c49 /pkg/machine/e2e/config.go | |
| parent | f27f9de5e668afb50073f125f25f8f61618a5742 (diff) | |
| parent | 4a834655118a83898a20b20663dfd048855fbf5f (diff) | |
| download | podman-2958aee08389aa5e89794f5e5b4f30ac3328d071.tar.gz podman-2958aee08389aa5e89794f5e5b4f30ac3328d071.tar.bz2 podman-2958aee08389aa5e89794f5e5b4f30ac3328d071.zip | |
Merge pull request #14417 from Luap99/machine-ssh
podman machine ssh: set correct exit code
Diffstat (limited to 'pkg/machine/e2e/config.go')
| -rw-r--r-- | pkg/machine/e2e/config.go | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/pkg/machine/e2e/config.go b/pkg/machine/e2e/config.go index c17b840d3..248a2f0ad 100644 --- a/pkg/machine/e2e/config.go +++ b/pkg/machine/e2e/config.go @@ -85,6 +85,14 @@ func (ms *machineSession) outputToString() string { return strings.Join(fields, " ") } +// errorToString returns the error output from a session in string form +func (ms *machineSession) errorToString() string { + if ms == nil || ms.Err == nil || ms.Err.Contents() == nil { + return "" + } + return string(ms.Err.Contents()) +} + // newMB constructor for machine test builders func newMB() (*machineTestBuilder, error) { mb := machineTestBuilder{ |