net/http/cgi: eliminate use of Perl in tests

[gostls13.git] / src / net / http / cgi / integration_test.go

diff --git a/src/net/http/cgi/integration_test.go b/src/net/http/cgi/integration_test.go
index 76cbca8e6036725ac5091b0dd51ffbd2e2869677..68f908e2b26d8d8da7f2a7b3fa0da70ff70f8457 100644 (file)
--- a/src/net/http/cgi/integration_test.go
+++ b/src/net/http/cgi/integration_test.go
@@ -20,7 +20,6 @@ import (
        "os"
        "strings"
        "testing"
-       "time"
 )
 
 // This test is a CGI host (testing host.go) that runs its own binary
@@ -31,7 +30,6 @@ func TestHostingOurselves(t *testing.T) {
        h := &Handler{
                Path: os.Args[0],
                Root: "/test.go",
-               Args: []string{"-test.run=TestBeChildCGIProcess"},
        }
        expectedMap := map[string]string{
                "test":                  "Hello CGI-in-CGI",
@@ -95,43 +93,19 @@ func (w *limitWriter) Write(p []byte) (n int, err error) {
 func TestKillChildAfterCopyError(t *testing.T) {
        testenv.MustHaveExec(t)
 
-       defer func() { testHookStartProcess = nil }()
-       proc := make(chan *os.Process, 1)
-       testHookStartProcess = func(p *os.Process) {
-               proc <- p
-       }
-
        h := &Handler{
                Path: os.Args[0],
                Root: "/test.go",
-               Args: []string{"-test.run=TestBeChildCGIProcess"},
        }
-       req, _ := http.NewRequest("GET", "http://example.com/test.cgi?write-forever=1", nil)
+       req, _ := http.NewRequest("GET", "http://example.com/test.go?write-forever=1", nil)
        rec := httptest.NewRecorder()
        var out bytes.Buffer
        const writeLen = 50 << 10
        rw := &customWriterRecorder{&limitWriter{&out, writeLen}, rec}
 
-       donec := make(chan bool, 1)
-       go func() {
-               h.ServeHTTP(rw, req)
-               donec <- true
-       }()
-
-       select {
-       case <-donec:
-               if out.Len() != writeLen || out.Bytes()[0] != 'a' {
-                       t.Errorf("unexpected output: %q", out.Bytes())
-               }
-       case <-time.After(5 * time.Second):
-               t.Errorf("timeout. ServeHTTP hung and didn't kill the child process?")
-               select {
-               case p := <-proc:
-                       p.Kill()
-                       t.Logf("killed process")
-               default:
-                       t.Logf("didn't kill process")
-               }
+       h.ServeHTTP(rw, req)
+       if out.Len() != writeLen || out.Bytes()[0] != 'a' {
+               t.Errorf("unexpected output: %q", out.Bytes())
        }
 }
 
@@ -143,7 +117,6 @@ func TestChildOnlyHeaders(t *testing.T) {
        h := &Handler{
                Path: os.Args[0],
                Root: "/test.go",
-               Args: []string{"-test.run=TestBeChildCGIProcess"},
        }
        expectedMap := map[string]string{
                "_body": "",
@@ -162,7 +135,6 @@ func TestNilRequestBody(t *testing.T) {
        h := &Handler{
                Path: os.Args[0],
                Root: "/test.go",
-               Args: []string{"-test.run=TestBeChildCGIProcess"},
        }
        expectedMap := map[string]string{
                "nil-request-body": "false",
@@ -177,7 +149,6 @@ func TestChildContentType(t *testing.T) {
        h := &Handler{
                Path: os.Args[0],
                Root: "/test.go",
-               Args: []string{"-test.run=TestBeChildCGIProcess"},
        }
        var tests = []struct {
                name   string
@@ -225,7 +196,6 @@ func want500Test(t *testing.T, path string) {
        h := &Handler{
                Path: os.Args[0],
                Root: "/test.go",
-               Args: []string{"-test.run=TestBeChildCGIProcess"},
        }
        expectedMap := map[string]string{
                "_body": "",
@@ -235,61 +205,3 @@ func want500Test(t *testing.T, path string) {
                t.Errorf("Got code %d; want 500", replay.Code)
        }
 }
-
-type neverEnding byte
-
-func (b neverEnding) Read(p []byte) (n int, err error) {
-       for i := range p {
-               p[i] = byte(b)
-       }
-       return len(p), nil
-}
-
-// Note: not actually a test.
-func TestBeChildCGIProcess(t *testing.T) {
-       if os.Getenv("REQUEST_METHOD") == "" {
-               // Not in a CGI environment; skipping test.
-               return
-       }
-       switch os.Getenv("REQUEST_URI") {
-       case "/immediate-disconnect":
-               os.Exit(0)
-       case "/no-content-type":
-               fmt.Printf("Content-Length: 6\n\nHello\n")
-               os.Exit(0)
-       case "/empty-headers":
-               fmt.Printf("\nHello")
-               os.Exit(0)
-       }
-       Serve(http.HandlerFunc(func(rw http.ResponseWriter, req *http.Request) {
-               if req.FormValue("nil-request-body") == "1" {
-                       fmt.Fprintf(rw, "nil-request-body=%v\n", req.Body == nil)
-                       return
-               }
-               rw.Header().Set("X-Test-Header", "X-Test-Value")
-               req.ParseForm()
-               if req.FormValue("no-body") == "1" {
-                       return
-               }
-               if eb, ok := req.Form["exact-body"]; ok {
-                       io.WriteString(rw, eb[0])
-                       return
-               }
-               if req.FormValue("write-forever") == "1" {
-                       io.Copy(rw, neverEnding('a'))
-                       for {
-                               time.Sleep(5 * time.Second) // hang forever, until killed
-                       }
-               }
-               fmt.Fprintf(rw, "test=Hello CGI-in-CGI\n")
-               for k, vv := range req.Form {
-                       for _, v := range vv {
-                               fmt.Fprintf(rw, "param-%s=%s\n", k, v)
-                       }
-               }
-               for _, kv := range os.Environ() {
-                       fmt.Fprintf(rw, "env-%s\n", kv)
-               }
-       }))
-       os.Exit(0)
-}