mirror of
https://github.com/golang/go.git
synced 2025-12-08 06:10:04 +00:00
all: fix spellings
This follows the spelling choices that the Go project has made for English words.
https://github.com/golang/go/wiki/Spelling
Change-Id: Ie7c586d2cf23020cb492cfff58c0831d2d8d3a78
GitHub-Last-Rev: e16a32cd22
GitHub-Pull-Request: golang/go#45442
Reviewed-on: https://go-review.googlesource.com/c/go/+/308291
Run-TryBot: Ian Lance Taylor <iant@golang.org>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Trust: Emmanuel Odeke <emmanuel@orijtech.com>
This commit is contained in:
parent
554d2c4f06
commit
52bf14e0e8
10 changed files with 20 additions and 18 deletions
|
|
@ -5,7 +5,7 @@
|
||||||
// +build !android
|
// +build !android
|
||||||
|
|
||||||
// Test that pthread_cancel works as expected
|
// Test that pthread_cancel works as expected
|
||||||
// (NPTL uses SIGRTMIN to implement thread cancelation)
|
// (NPTL uses SIGRTMIN to implement thread cancellation)
|
||||||
// See https://golang.org/issue/6997
|
// See https://golang.org/issue/6997
|
||||||
package cgotest
|
package cgotest
|
||||||
|
|
||||||
|
|
@ -17,8 +17,10 @@ extern int CancelThread();
|
||||||
*/
|
*/
|
||||||
import "C"
|
import "C"
|
||||||
|
|
||||||
import "testing"
|
import (
|
||||||
import "time"
|
"testing"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
func test6997(t *testing.T) {
|
func test6997(t *testing.T) {
|
||||||
r := C.StartThread()
|
r := C.StartThread()
|
||||||
|
|
|
||||||
|
|
@ -661,7 +661,7 @@ func XTestWithCancelCanceledParent(t testingT) {
|
||||||
t.Errorf("child not done immediately upon construction")
|
t.Errorf("child not done immediately upon construction")
|
||||||
}
|
}
|
||||||
if got, want := c.Err(), Canceled; got != want {
|
if got, want := c.Err(), Canceled; got != want {
|
||||||
t.Errorf("child not cancelled; got = %v, want = %v", got, want)
|
t.Errorf("child not canceled; got = %v, want = %v", got, want)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -779,7 +779,7 @@ func XTestCustomContextGoroutines(t testingT) {
|
||||||
defer cancel6()
|
defer cancel6()
|
||||||
checkNoGoroutine()
|
checkNoGoroutine()
|
||||||
|
|
||||||
// Check applied to cancelled context.
|
// Check applied to canceled context.
|
||||||
cancel6()
|
cancel6()
|
||||||
cancel1()
|
cancel1()
|
||||||
_, cancel7 := WithCancel(ctx5)
|
_, cancel7 := WithCancel(ctx5)
|
||||||
|
|
|
||||||
|
|
@ -1989,7 +1989,7 @@ func TestServerHandshakeContextCancellation(t *testing.T) {
|
||||||
// TestHandshakeContextHierarchy tests whether the contexts
|
// TestHandshakeContextHierarchy tests whether the contexts
|
||||||
// available to GetClientCertificate and GetCertificate are
|
// available to GetClientCertificate and GetCertificate are
|
||||||
// derived from the context provided to HandshakeContext, and
|
// derived from the context provided to HandshakeContext, and
|
||||||
// that those contexts are cancelled after HandshakeContext has
|
// that those contexts are canceled after HandshakeContext has
|
||||||
// returned.
|
// returned.
|
||||||
func TestHandshakeContextHierarchy(t *testing.T) {
|
func TestHandshakeContextHierarchy(t *testing.T) {
|
||||||
c, s := localPipe(t)
|
c, s := localPipe(t)
|
||||||
|
|
@ -2024,7 +2024,7 @@ func TestHandshakeContextHierarchy(t *testing.T) {
|
||||||
select {
|
select {
|
||||||
case <-innerCtx.Done():
|
case <-innerCtx.Done():
|
||||||
default:
|
default:
|
||||||
t.Errorf("GetClientCertificate context was not cancelled after HandshakeContext returned.")
|
t.Errorf("GetClientCertificate context was not canceled after HandshakeContext returned.")
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
var innerCtx context.Context
|
var innerCtx context.Context
|
||||||
|
|
@ -2048,7 +2048,7 @@ func TestHandshakeContextHierarchy(t *testing.T) {
|
||||||
select {
|
select {
|
||||||
case <-innerCtx.Done():
|
case <-innerCtx.Done():
|
||||||
default:
|
default:
|
||||||
t.Errorf("GetCertificate context was not cancelled after HandshakeContext returned.")
|
t.Errorf("GetCertificate context was not canceled after HandshakeContext returned.")
|
||||||
}
|
}
|
||||||
if err := <-clientErr; err != nil {
|
if err := <-clientErr; err != nil {
|
||||||
t.Errorf("Unexpected client error: %v", err)
|
t.Errorf("Unexpected client error: %v", err)
|
||||||
|
|
|
||||||
|
|
@ -1795,7 +1795,7 @@ func (db *DB) beginDC(ctx context.Context, dc *driverConn, release func(error),
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
// Schedule the transaction to rollback when the context is cancelled.
|
// Schedule the transaction to rollback when the context is canceled.
|
||||||
// The cancel function in Tx will be called after done is set to true.
|
// The cancel function in Tx will be called after done is set to true.
|
||||||
ctx, cancel := context.WithCancel(ctx)
|
ctx, cancel := context.WithCancel(ctx)
|
||||||
tx = &Tx{
|
tx = &Tx{
|
||||||
|
|
|
||||||
|
|
@ -656,7 +656,7 @@ func TestPoolExhaustOnCancel(t *testing.T) {
|
||||||
db.SetMaxOpenConns(max)
|
db.SetMaxOpenConns(max)
|
||||||
|
|
||||||
// First saturate the connection pool.
|
// First saturate the connection pool.
|
||||||
// Then start new requests for a connection that is cancelled after it is requested.
|
// Then start new requests for a connection that is canceled after it is requested.
|
||||||
|
|
||||||
state = 1
|
state = 1
|
||||||
for i := 0; i < max; i++ {
|
for i := 0; i < max; i++ {
|
||||||
|
|
@ -2784,7 +2784,7 @@ func TestTxCannotCommitAfterRollback(t *testing.T) {
|
||||||
// 3. Check if 2.A has committed in Tx (pass) or outside of Tx (fail).
|
// 3. Check if 2.A has committed in Tx (pass) or outside of Tx (fail).
|
||||||
sendQuery := make(chan struct{})
|
sendQuery := make(chan struct{})
|
||||||
// The Tx status is returned through the row results, ensure
|
// The Tx status is returned through the row results, ensure
|
||||||
// that the rows results are not cancelled.
|
// that the rows results are not canceled.
|
||||||
bypassRowsAwaitDone = true
|
bypassRowsAwaitDone = true
|
||||||
hookTxGrabConn = func() {
|
hookTxGrabConn = func() {
|
||||||
cancel()
|
cancel()
|
||||||
|
|
|
||||||
|
|
@ -1945,7 +1945,7 @@ func TestClientDoCanceledVsTimeout_h2(t *testing.T) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Issue 33545: lock-in the behavior promised by Client.Do's
|
// Issue 33545: lock-in the behavior promised by Client.Do's
|
||||||
// docs about request cancelation vs timing out.
|
// docs about request cancellation vs timing out.
|
||||||
func testClientDoCanceledVsTimeout(t *testing.T, h2 bool) {
|
func testClientDoCanceledVsTimeout(t *testing.T, h2 bool) {
|
||||||
defer afterTest(t)
|
defer afterTest(t)
|
||||||
cst := newClientServerTest(t, h2, HandlerFunc(func(w ResponseWriter, r *Request) {
|
cst := newClientServerTest(t, h2, HandlerFunc(func(w ResponseWriter, r *Request) {
|
||||||
|
|
|
||||||
|
|
@ -478,7 +478,7 @@ func TestDumpResponse(t *testing.T) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Issue 38352: Check for deadlock on cancelled requests.
|
// Issue 38352: Check for deadlock on canceled requests.
|
||||||
func TestDumpRequestOutIssue38352(t *testing.T) {
|
func TestDumpRequestOutIssue38352(t *testing.T) {
|
||||||
if testing.Short() {
|
if testing.Short() {
|
||||||
return
|
return
|
||||||
|
|
|
||||||
|
|
@ -562,7 +562,7 @@ func (p *ReverseProxy) handleUpgradeResponse(rw http.ResponseWriter, req *http.R
|
||||||
|
|
||||||
backConnCloseCh := make(chan bool)
|
backConnCloseCh := make(chan bool)
|
||||||
go func() {
|
go func() {
|
||||||
// Ensure that the cancelation of a request closes the backend.
|
// Ensure that the cancellation of a request closes the backend.
|
||||||
// See issue https://golang.org/issue/35559.
|
// See issue https://golang.org/issue/35559.
|
||||||
select {
|
select {
|
||||||
case <-req.Context().Done():
|
case <-req.Context().Done():
|
||||||
|
|
|
||||||
|
|
@ -287,7 +287,7 @@ func (name handler) serveDeltaProfile(w http.ResponseWriter, r *http.Request, p
|
||||||
err := r.Context().Err()
|
err := r.Context().Err()
|
||||||
if err == context.DeadlineExceeded {
|
if err == context.DeadlineExceeded {
|
||||||
serveError(w, http.StatusRequestTimeout, err.Error())
|
serveError(w, http.StatusRequestTimeout, err.Error())
|
||||||
} else { // TODO: what's a good status code for cancelled requests? 400?
|
} else { // TODO: what's a good status code for canceled requests? 400?
|
||||||
serveError(w, http.StatusInternalServerError, err.Error())
|
serveError(w, http.StatusInternalServerError, err.Error())
|
||||||
}
|
}
|
||||||
return
|
return
|
||||||
|
|
|
||||||
|
|
@ -1187,7 +1187,7 @@ type wantConn struct {
|
||||||
|
|
||||||
// hooks for testing to know when dials are done
|
// hooks for testing to know when dials are done
|
||||||
// beforeDial is called in the getConn goroutine when the dial is queued.
|
// beforeDial is called in the getConn goroutine when the dial is queued.
|
||||||
// afterDial is called when the dial is completed or cancelled.
|
// afterDial is called when the dial is completed or canceled.
|
||||||
beforeDial func()
|
beforeDial func()
|
||||||
afterDial func()
|
afterDial func()
|
||||||
|
|
||||||
|
|
@ -1375,7 +1375,7 @@ func (t *Transport) getConn(treq *transportRequest, cm connectMethod) (pc *persi
|
||||||
trace.GotConn(httptrace.GotConnInfo{Conn: w.pc.conn, Reused: w.pc.isReused()})
|
trace.GotConn(httptrace.GotConnInfo{Conn: w.pc.conn, Reused: w.pc.isReused()})
|
||||||
}
|
}
|
||||||
if w.err != nil {
|
if w.err != nil {
|
||||||
// If the request has been cancelled, that's probably
|
// If the request has been canceled, that's probably
|
||||||
// what caused w.err; if so, prefer to return the
|
// what caused w.err; if so, prefer to return the
|
||||||
// cancellation error (see golang.org/issue/16049).
|
// cancellation error (see golang.org/issue/16049).
|
||||||
select {
|
select {
|
||||||
|
|
@ -1437,7 +1437,7 @@ func (t *Transport) queueForDial(w *wantConn) {
|
||||||
|
|
||||||
// dialConnFor dials on behalf of w and delivers the result to w.
|
// dialConnFor dials on behalf of w and delivers the result to w.
|
||||||
// dialConnFor has received permission to dial w.cm and is counted in t.connCount[w.cm.key()].
|
// dialConnFor has received permission to dial w.cm and is counted in t.connCount[w.cm.key()].
|
||||||
// If the dial is cancelled or unsuccessful, dialConnFor decrements t.connCount[w.cm.key()].
|
// If the dial is canceled or unsuccessful, dialConnFor decrements t.connCount[w.cm.key()].
|
||||||
func (t *Transport) dialConnFor(w *wantConn) {
|
func (t *Transport) dialConnFor(w *wantConn) {
|
||||||
defer w.afterDial()
|
defer w.afterDial()
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue