0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #47081 from vvoland/c8d-integration-cli-skipcontainerconfig

Browse source 
c8d/integration-cli: Skip tests checking `ContainerConfig`
This commit is contained in:
Paweł Gronowski 2024-01-16 14:50:02 +01:00 • committed by GitHub
commit 4ff8436ebd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
integration-cli/docker_cli_build_test.go
View file

@ -17,6 +17,7 @@ import (
"text/template"
"time"
"github.com/docker/docker/api/types/versions"
"github.com/docker/docker/integration-cli/cli"
"github.com/docker/docker/integration-cli/cli/build"
"github.com/docker/docker/pkg/archive"
@ -29,6 +30,7 @@ import (
"gotest.tools/v3/assert"
is "gotest.tools/v3/assert/cmp"
"gotest.tools/v3/icmd"
"gotest.tools/v3/skip"
)
type DockerCLIBuildSuite struct {
@ -3344,6 +3346,9 @@ RUN echo 123`)).Assert(c, icmd.Expected{
}
func (s *DockerCLIBuildSuite) TestBuildWithTabs(c *testing.T) {
skip.If(c, versions.GreaterThan(testEnv.DaemonAPIVersion(), "1.44"), "ContainerConfig is deprecated")
skip.If(c, testEnv.UsingSnapshotter, "ContainerConfig is not filled in c8d")
const name = "testbuildwithtabs"
buildImageSuccessfully(c, name, build.WithDockerfile("FROM busybox\nRUN echo\tone\t\ttwo"))
res := inspectFieldJSON(c, name, "ContainerConfig.Cmd")
@ -5190,6 +5195,9 @@ func (s *DockerCLIBuildSuite) TestBuildWithUTF8BOMDockerignore(c *testing.T) {
// #22489 Shell test to confirm config gets updated correctly
func (s *DockerCLIBuildSuite) TestBuildShellUpdatesConfig(c *testing.T) {
skip.If(c, versions.GreaterThan(testEnv.DaemonAPIVersion(), "1.44"), "ContainerConfig is deprecated")
skip.If(c, testEnv.UsingSnapshotter, "ContainerConfig is not filled in c8d")
const name = "testbuildshellupdatesconfig"
buildImageSuccessfully(c, name, build.WithDockerfile(`FROM `+minimalBaseImage()+`