aboutsummaryrefslogtreecommitdiff
path: root/pkg/varlinkapi/virtwriter
diff options
context:
space:
mode:
authorPeter Hunt <pehunt@redhat.com>2019-07-19 16:19:17 -0400
committerPeter Hunt <pehunt@redhat.com>2019-07-23 13:29:33 -0400
commit35ba77e0409036c455f85d9f8fcbe361f0693335 (patch)
tree20ade93fa60858856a861d279bfa3991f702cf7b /pkg/varlinkapi/virtwriter
parent2a474c88c9ffc7221b09513ad4db8720ca7661cb (diff)
downloadpodman-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/varlinkapi/virtwriter')
-rw-r--r--pkg/varlinkapi/virtwriter/virtwriter.go11
1 files changed, 5 insertions, 6 deletions
diff --git a/pkg/varlinkapi/virtwriter/virtwriter.go b/pkg/varlinkapi/virtwriter/virtwriter.go
index 23f945704..8cdedeed8 100644
--- a/pkg/varlinkapi/virtwriter/virtwriter.go
+++ b/pkg/varlinkapi/virtwriter/virtwriter.go
@@ -113,7 +113,7 @@ func Reader(r *bufio.Reader, output, errput, input io.Writer, resize chan remote
if output != nil {
_, err := io.CopyN(output, r, messageSize)
if err != nil {
- return errors.Wrapf(err, "issue stdout")
+ return errors.Wrapf(err, "issue stdout")
}
}
case ToStderr:
@@ -121,14 +121,14 @@ func Reader(r *bufio.Reader, output, errput, input io.Writer, resize chan remote
_, err := io.CopyN(errput, r, messageSize)
if err != nil {
return err
- return errors.Wrapf(err, "issue stderr")
+ return errors.Wrapf(err, "issue stderr")
}
}
case ToStdin:
if input != nil {
_, err := io.CopyN(input, r, messageSize)
if err != nil {
- return errors.Wrapf(err, "issue stdin")
+ return errors.Wrapf(err, "issue stdin")
}
}
case TerminalResize:
@@ -159,7 +159,7 @@ func Reader(r *bufio.Reader, output, errput, input io.Writer, resize chan remote
}
if execEcChan != nil {
ecInt := binary.BigEndian.Uint32(out)
- execEcChan <-int(ecInt)
+ execEcChan <- int(ecInt)
}
return nil
@@ -175,8 +175,7 @@ func HangUp(writer *bufio.Writer, ec int) (err error) {
n := 0
msg := make([]byte, 4)
- binary.LittleEndian.PutUint32(msg, uint32(ec))
-
+ binary.BigEndian.PutUint32(msg, uint32(ec))
writeQuit := NewVirtWriteCloser(writer, Quit)
if n, err = writeQuit.Write(msg); err != nil {