integration-cli: DockerCLIBuildSuite: replace dockerCmd

Also adding some consts for fixed values.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2023-07-27 19:57:51 +02:00
parent 4292f42308
commit 980a5bc72a
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
2 changed files with 219 additions and 219 deletions

File diff suppressed because it is too large Load diff

View file

@ -25,8 +25,8 @@ import (
func (s *DockerCLIBuildSuite) TestBuildResourceConstraintsAreUsed(c *testing.T) {
testRequires(c, cpuCfsQuota)
name := "testbuildresourceconstraints"
buildLabel := "DockerCLIBuildSuite.TestBuildResourceConstraintsAreUsed"
const name = "testbuildresourceconstraints"
const buildLabel = "DockerCLIBuildSuite.TestBuildResourceConstraintsAreUsed"
ctx := fakecontext.New(c, "", fakecontext.WithDockerfile(`
FROM hello-world:frozen
@ -85,7 +85,7 @@ func (s *DockerCLIBuildSuite) TestBuildResourceConstraintsAreUsed(c *testing.T)
func (s *DockerCLIBuildSuite) TestBuildAddChangeOwnership(c *testing.T) {
testRequires(c, DaemonIsLinux)
name := "testbuildaddown"
const name = "testbuildaddown"
ctx := func() *fakecontext.Fake {
dockerfile := `
@ -131,7 +131,7 @@ func (s *DockerCLIBuildSuite) TestBuildAddChangeOwnership(c *testing.T) {
// Potential issue: newEventObserver uses docker events, which is not hooked up to buildkit.
func (s *DockerCLIBuildSuite) TestBuildCancellationKillsSleep(c *testing.T) {
testRequires(c, DaemonIsLinux, TODOBuildkit)
name := "testbuildcancellation"
const name = "testbuildcancellation"
observer, err := newEventObserver(c)
assert.NilError(c, err)