Merge pull request #126 from crazy-max/test-fix-timer

test: fix timer reset
moby · Sep 20, 2024 · ea9f9fb · ea9f9fb
2 parents d0f0129 + f4794c8
commit ea9f9fb
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 7 deletions.
diff --git a/test/build_test.go b/test/build_test.go
@@ -43,7 +43,6 @@ RUN cp /etc/foo /etc/bar
 		fstest.CreateFile("Dockerfile", dockerfile, 0600),
 		fstest.CreateFile("foo", []byte("foo"), 0600),
 	)
-	b.ResetTimer()
 	b.StartTimer()
 	out, err := buildxBuildCmd(sb, withArgs(dir))
 	b.StopTimer()
@@ -65,7 +64,6 @@ COPY --from=base /etc/bar /bar
 		fstest.CreateFile("Dockerfile", dockerfile, 0600),
 		fstest.CreateFile("foo", []byte("foo"), 0600),
 	)
-	b.ResetTimer()
 	b.StartTimer()
 	out, err := buildxBuildCmd(sb, withArgs(dir))
 	b.StopTimer()
@@ -84,7 +82,6 @@ RUN --mount=type=secret,id=SECRET cat /run/secrets/SECRET
 		fstest.CreateFile("Dockerfile", dockerfile, 0600),
 		fstest.CreateFile("secret.txt", []byte("mysecret"), 0600),
 	)
-	b.ResetTimer()
 	b.StartTimer()
 	out, err := buildxBuildCmd(sb, withDir(dir), withArgs("--secret=id=SECRET,src=secret.txt", "."))
 	b.StopTimer()
@@ -93,7 +90,6 @@ RUN --mount=type=secret,id=SECRET cat /run/secrets/SECRET
 }
 
 func benchmarkBuildRemote(b *testing.B, sb testutil.Sandbox) {
-	b.ResetTimer()
 	b.StartTimer()
 	out, err := buildxBuildCmd(sb, withArgs(
 		"--build-arg=BUILDKIT_SYNTAX="+dockerfileImagePin,
@@ -139,7 +135,6 @@ RUN cp /etc/foo /etc/bar
 			require.NoError(b, err, out)
 		}()
 	}
-	b.ResetTimer()
 	b.StartTimer()
 	wg.Wait()
 	b.StopTimer()
@@ -174,7 +169,6 @@ RUN du -sh . && tree .
 		fstest.Apply(appliers...),
 	)
 
-	b.ResetTimer()
 	b.StartTimer()
 	out, err := buildxBuildCmd(sb, withArgs(dir))
 	b.StopTimer()

diff --git a/test/daemon_test.go b/test/daemon_test.go
@@ -62,7 +62,6 @@ func testDaemonDebugHeap(t *testing.T, sb testutil.Sandbox) {
 
 func benchmarkDaemonVersion(b *testing.B, sb testutil.Sandbox) {
 	buildkitdPath := path.Join(sb.BinsDir(), sb.Name(), "buildkitd")
-	b.ResetTimer()
 	b.StartTimer()
 	err := exec.Command(buildkitdPath, "--version").Run()
 	b.StopTimer()

diff --git a/util/testutil/run.go b/util/testutil/run.go
@@ -245,6 +245,7 @@ func Run(tb testing.TB, runners []Runner, opt ...TestOpt) {
 								runner.Run(tb, sb)
 							}
 							if b, ok := tb.(*testing.B); ok {
+								b.ResetTimer()
 								for i := 0; i < b.N; i++ {
 									runWithSandbox(b)
 								}