-
Notifications
You must be signed in to change notification settings - Fork 17.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
httptest: introduce TempServer, clean up tests
This also breaks fs_test into two parts as the range tests test http's private httpRange and I had to change the fs_test package from "http" to "http_test" to use httptest which otherwise has a cyclic depedency back on http. Aside: we should start exposing the Range stuff in the future. R=rsc CC=golang-dev https://golang.org/cl/4261047
- Loading branch information
Showing
5 changed files
with
120 additions
and
93 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -7,5 +7,6 @@ include ../../../Make.inc | |
TARG=http/httptest | ||
GOFILES=\ | ||
recorder.go\ | ||
server.go\ | ||
|
||
include ../../../Make.pkg |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
// Copyright 2011 The Go Authors. All rights reserved. | ||
// Use of this source code is governed by a BSD-style | ||
// license that can be found in the LICENSE file. | ||
|
||
// Implementation of TempServer | ||
|
||
package httptest | ||
|
||
import ( | ||
"fmt" | ||
"http" | ||
"net" | ||
) | ||
|
||
// A Server is an HTTP server listening on a system-chosen port on the | ||
// local loopback interface, for use in end-to-end HTTP tests. | ||
type Server struct { | ||
URL string // base URL of form http://ipaddr:port with no trailing slash | ||
Listener net.Listener | ||
} | ||
|
||
// NewServer starts and returns a new Server. | ||
// The caller should call Close when finished, to shut it down. | ||
func NewServer(handler http.Handler) *Server { | ||
ts := new(Server) | ||
l, err := net.Listen("tcp", "127.0.0.1:0") | ||
if err != nil { | ||
if l, err = net.Listen("tcp6", "[::1]:0"); err != nil { | ||
panic(fmt.Sprintf("httptest: failed to listen on a port: %v", err)) | ||
} | ||
} | ||
ts.Listener = l | ||
ts.URL = "http://" + l.Addr().String() | ||
server := &http.Server{Handler: handler} | ||
go server.Serve(l) | ||
return ts | ||
} | ||
|
||
// Close shuts down the temporary server. | ||
func (s *Server) Close() { | ||
s.Listener.Close() | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,57 @@ | ||
// Copyright 2011 The Go Authors. All rights reserved. | ||
// Use of this source code is governed by a BSD-style | ||
// license that can be found in the LICENSE file. | ||
|
||
package http | ||
|
||
import ( | ||
"testing" | ||
) | ||
|
||
var ParseRangeTests = []struct { | ||
s string | ||
length int64 | ||
r []httpRange | ||
}{ | ||
{"", 0, nil}, | ||
{"foo", 0, nil}, | ||
{"bytes=", 0, nil}, | ||
{"bytes=5-4", 10, nil}, | ||
{"bytes=0-2,5-4", 10, nil}, | ||
{"bytes=0-9", 10, []httpRange{{0, 10}}}, | ||
{"bytes=0-", 10, []httpRange{{0, 10}}}, | ||
{"bytes=5-", 10, []httpRange{{5, 5}}}, | ||
{"bytes=0-20", 10, []httpRange{{0, 10}}}, | ||
{"bytes=15-,0-5", 10, nil}, | ||
{"bytes=-5", 10, []httpRange{{5, 5}}}, | ||
{"bytes=-15", 10, []httpRange{{0, 10}}}, | ||
{"bytes=0-499", 10000, []httpRange{{0, 500}}}, | ||
{"bytes=500-999", 10000, []httpRange{{500, 500}}}, | ||
{"bytes=-500", 10000, []httpRange{{9500, 500}}}, | ||
{"bytes=9500-", 10000, []httpRange{{9500, 500}}}, | ||
{"bytes=0-0,-1", 10000, []httpRange{{0, 1}, {9999, 1}}}, | ||
{"bytes=500-600,601-999", 10000, []httpRange{{500, 101}, {601, 399}}}, | ||
{"bytes=500-700,601-999", 10000, []httpRange{{500, 201}, {601, 399}}}, | ||
} | ||
|
||
func TestParseRange(t *testing.T) { | ||
for _, test := range ParseRangeTests { | ||
r := test.r | ||
ranges, err := parseRange(test.s, test.length) | ||
if err != nil && r != nil { | ||
t.Errorf("parseRange(%q) returned error %q", test.s, err) | ||
} | ||
if len(ranges) != len(r) { | ||
t.Errorf("len(parseRange(%q)) = %d, want %d", test.s, len(ranges), len(r)) | ||
continue | ||
} | ||
for i := range r { | ||
if ranges[i].start != r[i].start { | ||
t.Errorf("parseRange(%q)[%d].start = %d, want %d", test.s, i, ranges[i].start, r[i].start) | ||
} | ||
if ranges[i].length != r[i].length { | ||
t.Errorf("parseRange(%q)[%d].length = %d, want %d", test.s, i, ranges[i].length, r[i].length) | ||
} | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters