From bc7b1ca03da88473c10e59197becd812cf341663 Mon Sep 17 00:00:00 2001 From: baude Date: Fri, 19 Apr 2019 08:33:18 -0500 Subject: enable integration tests for remote-client first pass at enabling a swath of integration tests for the remote-client. Signed-off-by: baude --- cmd/podman/main_remote.go | 14 -------------- cmd/podman/varlink/io.podman.varlink | 5 ++++- 2 files changed, 4 insertions(+), 15 deletions(-) (limited to 'cmd/podman') diff --git a/cmd/podman/main_remote.go b/cmd/podman/main_remote.go index a3335050a..753730b56 100644 --- a/cmd/podman/main_remote.go +++ b/cmd/podman/main_remote.go @@ -3,10 +3,6 @@ package main import ( - "os" - - "github.com/containers/libpod/pkg/rootless" - "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) @@ -29,16 +25,6 @@ func profileOff(cmd *cobra.Command) error { } func setupRootless(cmd *cobra.Command, args []string) error { - if rootless.IsRootless() { - became, ret, err := rootless.BecomeRootInUserNS() - if err != nil { - logrus.Errorf(err.Error()) - os.Exit(1) - } - if became { - os.Exit(ret) - } - } return nil } diff --git a/cmd/podman/varlink/io.podman.varlink b/cmd/podman/varlink/io.podman.varlink index ace81646c..faaecdb6b 100644 --- a/cmd/podman/varlink/io.podman.varlink +++ b/cmd/podman/varlink/io.podman.varlink @@ -1254,4 +1254,7 @@ error ErrorOccurred (reason: string) error RuntimeError (reason: string) # The Podman endpoint requires that you use a streaming connection. -error WantsMoreRequired (reason: string) \ No newline at end of file +error WantsMoreRequired (reason: string) + +# Container is already stopped +error ErrCtrStopped (id: string) -- cgit v1.2.3-54-g00ecf