From 35ba77e0409036c455f85d9f8fcbe361f0693335 Mon Sep 17 00:00:00 2001 From: Peter Hunt Date: Fri, 19 Jul 2019 16:19:17 -0400 Subject: 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 --- pkg/adapter/containers_remote.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'pkg/adapter') 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 -- cgit v1.2.3-54-g00ecf