diff options
| author | Peter Hunt <pehunt@redhat.com> | 2019-07-19 16:19:17 -0400 |
|---|---|---|
| committer | Peter Hunt <pehunt@redhat.com> | 2019-07-23 13:29:33 -0400 |
| commit | 35ba77e0409036c455f85d9f8fcbe361f0693335 (patch) | |
| tree | 20ade93fa60858856a861d279bfa3991f702cf7b /pkg/adapter/containers_remote.go | |
| parent | 2a474c88c9ffc7221b09513ad4db8720ca7661cb (diff) | |
| download | podman-35ba77e0409036c455f85d9f8fcbe361f0693335.tar.gz podman-35ba77e0409036c455f85d9f8fcbe361f0693335.tar.bz2 podman-35ba77e0409036c455f85d9f8fcbe361f0693335.zip | |
Update e2e tests for remote exec
including changing -l to the container id
and separating a case of setting the env that remote can't handle
Signed-off-by: Peter Hunt <pehunt@redhat.com>
Diffstat (limited to 'pkg/adapter/containers_remote.go')
| -rw-r--r-- | pkg/adapter/containers_remote.go | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/pkg/adapter/containers_remote.go b/pkg/adapter/containers_remote.go index 665821bb6..7a9cf94b7 100644 --- a/pkg/adapter/containers_remote.go +++ b/pkg/adapter/containers_remote.go @@ -1054,15 +1054,14 @@ func (r *LocalRuntime) ExecContainer(ctx context.Context, cli *cliconfig.ExecVal if err != nil { return ec, errors.Wrapf(err, "Exec operation failed for %s", cli.InputArgs) } - ecChan := make(chan int, 1) errChan := configureVarlinkAttachStdio(r.Conn.Reader, r.Conn.Writer, inputStream, os.Stdout, oldTermState, resize, ecChan) select { - case err = <-errChan: - break - case ec = <-ecChan: - break + case ec = <-ecChan: + break + case err = <-errChan: + break } return ec, err |