Browse Source

integration-cli: DockerCLIBuildSuite: replace dockerCmd

Also adding some consts for fixed values.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Sebastiaan van Stijn 2 years ago
parent
commit
980a5bc72a
2 changed files with 125 additions and 125 deletions
  1. 121 121
      integration-cli/docker_cli_build_test.go
  2. 4 4
      integration-cli/docker_cli_build_unix_test.go

File diff suppressed because it is too large
+ 121 - 121
integration-cli/docker_cli_build_test.go


+ 4 - 4
integration-cli/docker_cli_build_unix_test.go

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

Some files were not shown because too many files changed in this diff