diff options
| -rw-r--r-- | cmd/podman/containers/logs.go | 2 | ||||
| -rw-r--r-- | test/e2e/logs_test.go | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/cmd/podman/containers/logs.go b/cmd/podman/containers/logs.go index 850cb2e1f..966998877 100644 --- a/cmd/podman/containers/logs.go +++ b/cmd/podman/containers/logs.go @@ -32,6 +32,8 @@ var ( Long: logsDescription, Args: func(cmd *cobra.Command, args []string) error { switch { + case registry.IsRemote() && logsOptions.Latest: + return errors.New(cmd.Name() + " does not support 'latest' when run remotely") case registry.IsRemote() && len(args) > 1: return errors.New(cmd.Name() + " does not support multiple containers when run remotely") case logsOptions.Latest && len(args) > 0: diff --git a/test/e2e/logs_test.go b/test/e2e/logs_test.go index 1ceab9161..dd69e4ce8 100644 --- a/test/e2e/logs_test.go +++ b/test/e2e/logs_test.go @@ -121,7 +121,6 @@ var _ = Describe("Podman logs", func() { }) It("latest and container name should fail", func() { - SkipIfRemote() // -l not supported results := podmanTest.Podman([]string{"logs", "-l", "foobar"}) results.WaitWithDefaultTimeout() Expect(results).To(ExitWithError()) @@ -159,7 +158,6 @@ var _ = Describe("Podman logs", func() { }) It("using journald for container with container tag", func() { - SkipIfRemote() Skip("need to verify images have correct packages for journald") logc := podmanTest.Podman([]string{"run", "--log-driver", "journald", "--log-opt=tag={{.ImageName}}", "-d", ALPINE, "sh", "-c", "echo podman; sleep 0.1; echo podman; sleep 0.1; echo podman"}) logc.WaitWithDefaultTimeout() @@ -178,7 +176,6 @@ var _ = Describe("Podman logs", func() { It("using journald for container name", func() { Skip("need to verify images have correct packages for journald") - SkipIfRemote() containerName := "inside-journal" logc := podmanTest.Podman([]string{"run", "--log-driver", "journald", "-d", "--name", containerName, ALPINE, "sh", "-c", "echo podman; sleep 0.1; echo podman; sleep 0.1; echo podman"}) logc.WaitWithDefaultTimeout() @@ -273,7 +270,6 @@ var _ = Describe("Podman logs", func() { }) It("streaming output", func() { - Skip(v2remotefail) containerName := "logs-f-rm" logc := podmanTest.Podman([]string{"run", "--rm", "--name", containerName, "-dt", ALPINE, "sh", "-c", "echo podman; sleep 1; echo podman"}) @@ -314,7 +310,6 @@ var _ = Describe("Podman logs", func() { }) It("follow output stopped container", func() { - Skip(v2remotefail) containerName := "logs-f" logc := podmanTest.Podman([]string{"run", "--name", containerName, "-d", ALPINE, "true"}) |