]> Cypherpunks repositories - gostls13.git/commitdiff
various: a grab-bag of time.Duration cleanups.
authorDavid Symonds <dsymonds@golang.org>
Mon, 12 Dec 2011 23:42:56 +0000 (10:42 +1100)
committerDavid Symonds <dsymonds@golang.org>
Mon, 12 Dec 2011 23:42:56 +0000 (10:42 +1100)
R=adg, r, rsc
CC=golang-dev
https://golang.org/cl/5475069

14 files changed:
src/cmd/godoc/index.go
src/pkg/exp/inotify/inotify_linux_test.go
src/pkg/exp/norm/normregtest.go
src/pkg/exp/winfsnotify/winfsnotify_test.go
src/pkg/go/printer/printer_test.go
src/pkg/io/pipe_test.go
src/pkg/net/http/doc.go
src/pkg/net/http/serve_test.go
src/pkg/net/http/server.go
src/pkg/net/http/transport_test.go
src/pkg/net/rpc/server_test.go
src/pkg/old/netchan/common.go
src/pkg/old/netchan/import.go
src/pkg/old/netchan/netchan_test.go

index e07cc2b0dbc6161eca7f9580f40601eba4b1a08f..3d2c3ff961d10b4c9866942b0b174c464d3f9796 100644 (file)
@@ -53,6 +53,7 @@ import (
        "regexp"
        "sort"
        "strings"
+       "time"
 )
 
 // ----------------------------------------------------------------------------
@@ -767,7 +768,7 @@ func canonical(w string) string { return strings.ToLower(w) }
 //
 func NewIndex(dirnames <-chan string, fulltextIndex bool, throttle float64) *Index {
        var x Indexer
-       th := NewThrottle(throttle, 0.1e9) // run at least 0.1s at a time
+       th := NewThrottle(throttle, 100*time.Millisecond) // run at least 0.1s at a time
 
        // initialize Indexer
        // (use some reasonably sized maps to start)
index a6bb46fe77d0d82eeebfb599a8b8a49065b6ba72..92384b693761ac025f97f33f720e838be4690da2 100644 (file)
@@ -57,7 +57,7 @@ func TestInotifyEvents(t *testing.T) {
        }
 
        // We expect this event to be received almost immediately, but let's wait 1 s to be sure
-       time.Sleep(1000e6) // 1000 ms
+       time.Sleep(1 * time.Second)
        if eventsReceived == 0 {
                t.Fatal("inotify event hasn't been received after 1 second")
        }
@@ -69,7 +69,7 @@ func TestInotifyEvents(t *testing.T) {
        select {
        case <-done:
                t.Log("event channel closed")
-       case <-time.After(1e9):
+       case <-time.After(1 * time.Second):
                t.Fatal("event stream was not closed after 1 second")
        }
 }
@@ -84,7 +84,7 @@ func TestInotifyClose(t *testing.T) {
                done = true
        }()
 
-       time.Sleep(50e6) // 50 ms
+       time.Sleep(50 * time.Millisecond)
        if !done {
                t.Fatal("double Close() test failed: second Close() call didn't return")
        }
index eb061eba23d2cccb64cb8623fa6d2689807e60f0..57ba7032981803e41b184fee922bb4adeeb263be 100644 (file)
@@ -285,7 +285,7 @@ func PerformanceTest() {
                norm.NFC.Append(nil, buf...)
                success <- true
        }()
-       timeout := time.After(1e9)
+       timeout := time.After(1 * time.Second)
        select {
        case <-success:
                // test completed before the timeout
index fb2b825e68e3fac258a72a46db6f4d4235183645..b9c43d9c006705bb7a1efc1cd80973cdae455ff1 100644 (file)
@@ -21,7 +21,7 @@ func expect(t *testing.T, eventstream <-chan *Event, name string, mask uint32) {
                if event.Name != name || event.Mask != mask {
                        t.Fatal("did not receive expected event")
                }
-       case <-time.After(1e9):
+       case <-time.After(1 * time.Second):
                t.Fatal("timed out waiting for event")
        }
 }
@@ -108,7 +108,7 @@ func TestNotifyClose(t *testing.T) {
                done = true
        }()
 
-       time.Sleep(50e6) // 50 ms
+       time.Sleep(50 * time.Millisecond)
        if !done {
                t.Fatal("double Close() test failed: second Close() call didn't return")
        }
index 924d4dfdb2901a769901791be091aa9de579c58b..45477d40f6e99ced3300a880c3c4e72754ceed34 100644 (file)
@@ -107,7 +107,7 @@ func check(t *testing.T, source, golden string, mode checkMode) {
        // start a timer to produce a time-out signal
        tc := make(chan int)
        go func() {
-               time.Sleep(10e9) // plenty of a safety margin, even for very slow machines
+               time.Sleep(10 * time.Second) // plenty of a safety margin, even for very slow machines
                tc <- 0
        }()
 
index fabf79bd61c3b9c9fc35e637d50c40ff0c224228..7718151b0e5a5b3ff845c0d57c557c3d1bf4f459 100644 (file)
@@ -165,7 +165,7 @@ var pipeTests = []pipeTest{
 }
 
 func delayClose(t *testing.T, cl closer, ch chan int, tt pipeTest) {
-       time.Sleep(1e6) // 1 ms
+       time.Sleep(1 * time.Millisecond)
        var err error
        if tt.closeWithError {
                err = cl.CloseWithError(tt.err)
index 9c47ac7823fde5085337d172b9ee2502e96f7712..2dbcf8dc97c8e0ef3b69e438a35eddd81ee680e2 100644 (file)
@@ -70,8 +70,8 @@ custom Server:
        s := &http.Server{
                Addr:           ":8080",
                Handler:        myHandler,
-               ReadTimeout:    10e9,
-               WriteTimeout:   10e9,
+               ReadTimeout:    10 * time.Second,
+               WriteTimeout:   10 * time.Second,
                MaxHeaderBytes: 1 << 20,
        }
        log.Fatal(s.ListenAndServe())
index 865f915a2bcf9adac7a6ced6ab8fcea52ec8a595..c68e6614b19079f6c5d27f9e275bbd765eff1063 100644 (file)
@@ -538,7 +538,7 @@ func TestHeadResponses(t *testing.T) {
 
 func TestTLSHandshakeTimeout(t *testing.T) {
        ts := httptest.NewUnstartedServer(HandlerFunc(func(w ResponseWriter, r *Request) {}))
-       ts.Config.ReadTimeout = 250e6
+       ts.Config.ReadTimeout = 250 * time.Millisecond
        ts.StartTLS()
        defer ts.Close()
        conn, err := net.Dial("tcp", ts.Listener.Addr().String())
index 61e8ba13fc63db32d402456859744efdf972dec5..fa9009517dbabe5659b737c906a031e35a090a30 100644 (file)
@@ -952,11 +952,11 @@ func Serve(l net.Listener, handler Handler) error {
 
 // A Server defines parameters for running an HTTP server.
 type Server struct {
-       Addr           string  // TCP address to listen on, ":http" if empty
-       Handler        Handler // handler to invoke, http.DefaultServeMux if nil
-       ReadTimeout    int64   // the net.Conn.SetReadTimeout value for new connections
-       WriteTimeout   int64   // the net.Conn.SetWriteTimeout value for new connections
-       MaxHeaderBytes int     // maximum size of request headers, DefaultMaxHeaderBytes if 0
+       Addr           string        // TCP address to listen on, ":http" if empty
+       Handler        Handler       // handler to invoke, http.DefaultServeMux if nil
+       ReadTimeout    time.Duration // the net.Conn.SetReadTimeout value for new connections
+       WriteTimeout   time.Duration // the net.Conn.SetWriteTimeout value for new connections
+       MaxHeaderBytes int           // maximum size of request headers, DefaultMaxHeaderBytes if 0
 }
 
 // ListenAndServe listens on the TCP network address srv.Addr and then
@@ -989,10 +989,10 @@ func (srv *Server) Serve(l net.Listener) error {
                        return e
                }
                if srv.ReadTimeout != 0 {
-                       rw.SetReadTimeout(srv.ReadTimeout)
+                       rw.SetReadTimeout(srv.ReadTimeout.Nanoseconds())
                }
                if srv.WriteTimeout != 0 {
-                       rw.SetWriteTimeout(srv.WriteTimeout)
+                       rw.SetWriteTimeout(srv.WriteTimeout.Nanoseconds())
                }
                c, err := srv.newConn(rw)
                if err != nil {
index 6f50f6f27677786157e282957b1a65f422764bbf..ff12fa2d01490962f3f9834217611eeebcaaa793 100644 (file)
@@ -292,7 +292,7 @@ func TestTransportServerClosingUnexpectedly(t *testing.T) {
        // it on most fast machines, causing the next fetch() call to
        // succeed quickly.  But if we do get errors, fetch() will retry 5
        // times with some delays between.
-       time.Sleep(25e6)
+       time.Sleep(25 * time.Millisecond)
 
        body3 := fetch(3, 5)
 
index f2895217aafa3886f8d9fe5bd37a493d70371900..a52a86e414ea02ebaf0fb95c90e495146e17f358 100644 (file)
@@ -27,7 +27,6 @@ var (
 )
 
 const (
-       second      = 1e9
        newHttpPath = "/foo"
 )
 
@@ -388,12 +387,12 @@ func (WriteFailCodec) WriteRequest(*Request, interface{}) error {
 }
 
 func (WriteFailCodec) ReadResponseHeader(*Response) error {
-       time.Sleep(120e9)
+       time.Sleep(120 * time.Second)
        panic("unreachable")
 }
 
 func (WriteFailCodec) ReadResponseBody(interface{}) error {
-       time.Sleep(120e9)
+       time.Sleep(120 * time.Second)
        panic("unreachable")
 }
 
@@ -413,7 +412,7 @@ func TestSendDeadlock(t *testing.T) {
        select {
        case <-done:
                return
-       case <-time.After(5e9):
+       case <-time.After(5 * time.Second):
                t.Fatal("deadlock")
        }
 }
index 03fa8ff6c4128661b1dbdb93e007e5ffbdef8f83..710b63ac50dbd256adf831a5bd9f5dce62ad53a0 100644 (file)
@@ -155,7 +155,7 @@ func (cs *clientSet) drain(timeout time.Duration) error {
                if timeout > 0 && time.Now().After(deadline) {
                        return errors.New("timeout")
                }
-               time.Sleep(100 * 1e6) // 100 milliseconds
+               time.Sleep(100 * time.Millisecond)
        }
        return nil
 }
@@ -188,7 +188,7 @@ func (cs *clientSet) sync(timeout time.Duration) error {
                if timeout > 0 && time.Now().After(deadline) {
                        return errors.New("timeout")
                }
-               time.Sleep(100 * 1e6) // 100 milliseconds
+               time.Sleep(100 * time.Millisecond)
        }
        return nil
 }
index a6da8210b99ccce86804274b5438eec43d582f47..50abaa9fa5a577bee9e1e21f1aa5345ba21a2d1b 100644 (file)
@@ -281,7 +281,7 @@ func (imp *Importer) Drain(timeout int64) error {
                if timeout > 0 && time.Now().After(deadline) {
                        return errors.New("timeout")
                }
-               time.Sleep(100 * 1e6)
+               time.Sleep(100 * time.Millisecond)
        }
        return nil
 }
index d11a6708661f0557b1acf1586a9e1c33a75d388b..53f0f78776566958c71ab3994cf5124603cf8e6b 100644 (file)
@@ -151,7 +151,7 @@ func TestErrorForIllegalChannel(t *testing.T) {
        // Expect an error now.  Start a timeout.
        timeout := make(chan bool, 1) // buffered so closure will not hang around.
        go func() {
-               time.Sleep(10e9) // very long, to give even really slow machines a chance.
+               time.Sleep(10 * time.Second) // very long, to give even really slow machines a chance.
                timeout <- true
        }()
        select {
@@ -300,7 +300,7 @@ func TestIndependentSends(t *testing.T) {
        go importReceive(imp, t, done)
 
        // wait for export side to try to deliver some values.
-       time.Sleep(0.25e9)
+       time.Sleep(250 * time.Millisecond)
 
        ctlch := make(chan int)
        if err := imp.ImportNValues("exportedCtl", ctlch, Send, 1, 1); err != nil {
@@ -409,7 +409,7 @@ func TestImportFlowControl(t *testing.T) {
 
 func testFlow(sendDone chan bool, ch <-chan int, N int, t *testing.T) {
        go func() {
-               time.Sleep(0.5e9)
+               time.Sleep(500 * time.Millisecond)
                sendDone <- false
        }()