mirror of
https://github.com/containers/podman.git
synced 2025-06-21 01:19:15 +08:00
testv2: enable attach test
testv2: enable attach test Signed-off-by: Qi Wang <qiwan@redhat.com>
This commit is contained in:
@ -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)
|
||||
}
|
||||
|
@ -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
|
||||
|
@ -20,7 +20,6 @@ var _ = Describe("Podman attach", func() {
|
||||
)
|
||||
|
||||
BeforeEach(func() {
|
||||
Skip(v2fail)
|
||||
tempdir, err = CreateTempDirInTempDir()
|
||||
if err != nil {
|
||||
os.Exit(1)
|
||||
|
Reference in New Issue
Block a user