Skip to content

Commit

Permalink
Merge pull request moby#4860 from racequite/master
Browse files Browse the repository at this point in the history
chore: fix function names in comment
  • Loading branch information
tonistiigi authored Apr 19, 2024
2 parents 71f99c5 + f24c575 commit bbd262a
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion client/build_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1221,7 +1221,7 @@ func testClientGatewayContainerExecTty(t *testing.T, sb integration.Sandbox) {
checkAllReleasable(t, c, sb, true)
}

// testClientGatewayContainerExecTty is testing the tty shuts down cleanly
// testClientGatewayContainerCancelExecTty is testing the tty shuts down cleanly
// on context.Cancel
func testClientGatewayContainerCancelExecTty(t *testing.T, sb integration.Sandbox) {
requiresLinux(t)
Expand Down
2 changes: 1 addition & 1 deletion executor/runcexecutor/executor.go
Original file line number Diff line number Diff line change
Expand Up @@ -479,7 +479,7 @@ func (s *forwardIO) Stderr() io.ReadCloser {
return nil
}

// newRuncProcKiller returns an abstraction for sending SIGKILL to the
// newRunProcKiller returns an abstraction for sending SIGKILL to the
// process inside the container initiated from `runc run`.
func newRunProcKiller(runC *runc.Runc, id string) procKiller {
return procKiller{runC: runC, id: id}
Expand Down
2 changes: 1 addition & 1 deletion solver/scheduler_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2378,7 +2378,7 @@ func TestSlowCacheAvoidAccess(t *testing.T) {
require.Equal(t, int64(1), cacheManager.loadCounter)
}

// TestSlowCacheAvoidExecOnCache tests a regression where an input with
// TestSlowCacheAvoidLoadOnCache tests a regression where an input with
// possible matches and a content based checksum should not try to checksum
// before other inputs with no keys have at least made into a slow state.
// moby/buildkit#648
Expand Down
2 changes: 1 addition & 1 deletion util/overlay/overlay_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ func checkDelete(path string, base string, f os.FileInfo) (delete, skip bool, _
return false, false, nil
}

// checkDelete checks if the specified file is an opaque directory
// checkOpaque checks if the specified file is an opaque directory
func checkOpaque(upperdir string, path string, base string, f os.FileInfo) (isOpaque bool, _ error) {
if f.IsDir() {
for _, oKey := range []string{"trusted.overlay.opaque", "user.overlay.opaque"} {
Expand Down

0 comments on commit bbd262a

Please sign in to comment.