aboutsummaryrefslogtreecommitdiff
path: root/src/os/exec
diff options
context:
space:
mode:
Diffstat (limited to 'src/os/exec')
-rw-r--r--src/os/exec/exec.go2
-rw-r--r--src/os/exec/exec_test.go4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/os/exec/exec.go b/src/os/exec/exec.go
index ee57ac4771..35e4e7e792 100644
--- a/src/os/exec/exec.go
+++ b/src/os/exec/exec.go
@@ -777,7 +777,7 @@ func (c *Cmd) watchCtx(resultc chan<- ctxResult) {
} else if errors.Is(interruptErr, os.ErrProcessDone) {
// The process already finished: we just didn't notice it yet.
// (Perhaps c.Wait hadn't been called, or perhaps it happened to race with
- // c.ctx being cancelled.) Don't inject a needless error.
+ // c.ctx being canceled.) Don't inject a needless error.
} else {
err = wrappedError{
prefix: "exec: canceling Cmd",
diff --git a/src/os/exec/exec_test.go b/src/os/exec/exec_test.go
index c4b89e0199..c749de99db 100644
--- a/src/os/exec/exec_test.go
+++ b/src/os/exec/exec_test.go
@@ -1366,7 +1366,7 @@ func TestWaitInterrupt(t *testing.T) {
})
// With a very long WaitDelay and no Cancel function, we should wait for the
- // process to exit even if the command's Context is cancelled.
+ // process to exit even if the command's Context is canceled.
t.Run("WaitDelay", func(t *testing.T) {
if runtime.GOOS == "windows" {
t.Skipf("skipping: os.Interrupt is not implemented on Windows")
@@ -1404,7 +1404,7 @@ func TestWaitInterrupt(t *testing.T) {
}
})
- // If the context is cancelled and the Cancel function sends os.Kill,
+ // If the context is canceled and the Cancel function sends os.Kill,
// the process should be terminated immediately, and its output
// pipes should be closed (causing Wait to return) after WaitDelay
// even if a child process is still writing to them.