code review 5318072: websocket: return an error HTTP response for bad websoc...

src/pkg/websocket/websocket_test.go

 // Copyright 2009 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 websocket
 
 import (
         "bytes"
         "fmt"
         "http"
@@ skipping 182 matching lines @@
                 t.Errorf("WebSocket handshake: %v", err)
                 return
         }
         ws.Close()
 }
 
 func TestHTTP(t *testing.T) {
         once.Do(startServer)
 
         // If the client did not send a handshake that matches the protocol
-        // specification, the server should abort the WebSocket connection.
-        _, err := http.Get(fmt.Sprintf("http://%s/echo", serverAddr))
-        if err == nil {
-                t.Error("Get: unexpected success")
-                return
-        }
-        urlerr, ok := err.(*url.Error)
-        if !ok {
-                t.Errorf("Get: not url.Error %#v", err)
-                return
-        }
-        if urlerr.Err != io.ErrUnexpectedEOF {
+        // specification, the server MUST return an HTTP respose with an
+        // appropriate error code (such as 400 Bad Request)
+        resp, err := http.Get(fmt.Sprintf("http://%s/echo", serverAddr))
+        if err != nil {
                 t.Errorf("Get: error %#v", err)
                 return
         }
+        if resp == nil {
+                t.Error("Get: resp is null")
+                return
+        }
+        if resp.StatusCode != http.StatusBadRequest {
+                t.Errorf("Get: expected %q got %q", http.StatusBadRequest, resp.StatusCode)
+        }
 }
 
 func TestTrailingSpaces(t *testing.T) {
         // http://code.google.com/p/go/issues/detail?id=955
         // The last runs of this create keys with trailing spaces that should not be
         // generated by the client.
         once.Do(startServer)
         config := newConfig(t, "/echo")
         for i := 0; i < 30; i++ {
                 // body
@@ skipping 38 matching lines @@
         n, err = conn.Read(second_msg)
         if err != nil {
                 t.Errorf("Read: %v", err)
         }
         second_msg = second_msg[0:n]
         if !bytes.Equal(msg[len(small_msg):], second_msg) {
                 t.Errorf("Echo: expected %q got %q", msg[len(small_msg):], second_msg)
         }
         conn.Close()
 }