Merge pull request #6047 from QiWang19/attach-test

testv2: enable attach test

3 files changed, 9 insertions, 3 deletions

diff --git a/cmd/podman/containers/attach.go b/cmd/podman/containers/attach.go
index 78b52ad1b..ee4d811d7 100644
--- a/cmd/podman/containers/attach.go
+++ b/cmd/podman/containers/attach.go
@@ -71,11 +71,18 @@ func init() {
 }
 
 func attach(cmd *cobra.Command, args []string) error {
+	if len(args) > 1 || (len(args) == 0 && !attachOpts.Latest) {
+		return errors.Errorf("attach requires the name or id of one running container or the latest flag")
+	}
+	var name string
+	if len(args) > 0 {
+		name = args[0]
+	}
 	attachOpts.Stdin = os.Stdin
 	if attachOpts.NoStdin {
 		attachOpts.Stdin = nil
 	}
 	attachOpts.Stdout = os.Stdout
 	attachOpts.Stderr = os.Stderr
-	return registry.ContainerEngine().ContainerAttach(registry.GetContext(), args[0], attachOpts)
+	return registry.ContainerEngine().ContainerAttach(registry.GetContext(), name, attachOpts)
 }
diff --git a/pkg/domain/infra/abi/containers.go b/pkg/domain/infra/abi/containers.go
index 4c3389418..82bf82bf0 100644
--- a/pkg/domain/infra/abi/containers.go
+++ b/pkg/domain/infra/abi/containers.go
@@ -514,7 +514,7 @@ func (ic *ContainerEngine) ContainerAttach(ctx context.Context, nameOrId string,
 	}
 
 	// If the container is in a pod, also set to recursively start dependencies
-	if err := terminal.StartAttachCtr(ctx, ctr, options.Stdin, options.Stderr, options.Stdin, options.DetachKeys, options.SigProxy, false, ctr.PodID() != ""); err != nil && errors.Cause(err) != define.ErrDetach {
+	if err := terminal.StartAttachCtr(ctx, ctr, options.Stdout, options.Stderr, options.Stdin, options.DetachKeys, options.SigProxy, false, ctr.PodID() != ""); err != nil && errors.Cause(err) != define.ErrDetach {
 		return errors.Wrapf(err, "error attaching to container %s", ctr.ID())
 	}
 	return nil
diff --git a/test/e2e/attach_test.go b/test/e2e/attach_test.go
index 6ca8a537c..7233d169c 100644
--- a/test/e2e/attach_test.go
+++ b/test/e2e/attach_test.go
@@ -20,7 +20,6 @@ var _ = Describe("Podman attach", func() {
 	)
 
 	BeforeEach(func() {
-		Skip(v2fail)
 		tempdir, err = CreateTempDirInTempDir()
 		if err != nil {
 			os.Exit(1)