opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-21 09:28:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

testv2: enable attach test

Browse Source 
testv2: enable attach test

Signed-off-by: Qi Wang <qiwan@redhat.com>
This commit is contained in:
Qi Wang
2020-04-29 23:47:01 -04:00
parent 99f8cfc2dc
commit 75eeb40f41
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/podman/containers/attach.go
View File

@ -71,11 +71,18 @@ func init() {
} }
func attach(cmd *cobra.Command, args []string) error { 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 attachOpts.Stdin = os.Stdin
if attachOpts.NoStdin { if attachOpts.NoStdin {
attachOpts.Stdin = nil attachOpts.Stdin = nil
} }
attachOpts.Stdout = os.Stdout attachOpts.Stdout = os.Stdout
attachOpts.Stderr = os.Stderr attachOpts.Stderr = os.Stderr
return registry.ContainerEngine().ContainerAttach(registry.GetContext(), args[0], attachOpts) return registry.ContainerEngine().ContainerAttach(registry.GetContext(), name, attachOpts)
} }

2
pkg/domain/infra/abi/containers.go
View File

@ -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 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 errors.Wrapf(err, "error attaching to container %s", ctr.ID())
} }
return nil return nil

1
test/e2e/attach_test.go
View File

@ -20,7 +20,6 @@ var _ = Describe("Podman attach", func() {
) )
BeforeEach(func() { BeforeEach(func() {
Skip(v2fail)
tempdir, err = CreateTempDirInTempDir() tempdir, err = CreateTempDirInTempDir()
if err != nil { if err != nil {
os.Exit(1) os.Exit(1)