Yong TangandSebastiaan van Stijn
618f290b37
This fix adds several improvement: 1. No need for explicit ContainerRemove as it has been handled in setupTest() 2. Added `container.WithImage` helper function and used it in commit tests. Signed-off-by: Yong Tang <yong.tang.github@outlook.com> (cherry picked from commit 6ab465804b0b8cec6c5ac278a21151d49e34885d) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
33 lines
878 B
Go
33 lines
878 B
Go
package container
|
|
|
|
import (
|
|
"context"
|
|
"io/ioutil"
|
|
"testing"
|
|
|
|
"github.com/docker/docker/api/types"
|
|
"github.com/docker/docker/integration/internal/container"
|
|
"github.com/docker/docker/integration/internal/request"
|
|
"github.com/docker/docker/pkg/stdcopy"
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
// Regression test for #35370
|
|
// Makes sure that when following we don't get an EOF error when there are no logs
|
|
func TestLogsFollowTailEmpty(t *testing.T) {
|
|
defer setupTest(t)()
|
|
client := request.NewAPIClient(t)
|
|
ctx := context.Background()
|
|
|
|
id := container.Run(t, ctx, client, container.WithCmd("sleep", "100000"))
|
|
|
|
logs, err := client.ContainerLogs(ctx, id, types.ContainerLogsOptions{ShowStdout: true, Tail: "2"})
|
|
if logs != nil {
|
|
defer logs.Close()
|
|
}
|
|
assert.NoError(t, err)
|
|
|
|
_, err = stdcopy.StdCopy(ioutil.Discard, ioutil.Discard, logs)
|
|
assert.NoError(t, err)
|
|
}
|