diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-08-05 22:57:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-05 22:57:48 +0200 |
| commit | a94863504166ad6fc9f31847e84b71cc32fcd09f (patch) | |
| tree | e541490175eb56692749365cd1d9d927fdd6fc18 /test | |
| parent | bae6d5ddafb9d293702fda368587caae22fc3c80 (diff) | |
| parent | 98da2fa80657fecb6b083eaf68974d2ee2f84e6a (diff) | |
| download | podman-a94863504166ad6fc9f31847e84b71cc32fcd09f.tar.gz podman-a94863504166ad6fc9f31847e84b71cc32fcd09f.tar.bz2 podman-a94863504166ad6fc9f31847e84b71cc32fcd09f.zip | |
Merge pull request #7212 from jwhonce/issues/7211
Refactor parsing to not require --remote to be first flag
Diffstat (limited to 'test')
| -rw-r--r-- | test/utils/utils.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/test/utils/utils.go b/test/utils/utils.go index 2c454f532..b279a7084 100644 --- a/test/utils/utils.go +++ b/test/utils/utils.go @@ -207,6 +207,10 @@ func WaitContainerReady(p PodmanTestCommon, id string, expStr string, timeout in // OutputToString formats session output to string func (s *PodmanSession) OutputToString() string { + if s == nil || s.Out == nil || s.Out.Contents() == nil { + return "" + } + fields := strings.Fields(string(s.Out.Contents())) return strings.Join(fields, " ") } |