From 7396bdc3b4745108760282890d0ae1c985865d69 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Fri, 1 Apr 2016 16:29:18 +0200 Subject: Fix NewServer --- server_test.go | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'server_test.go') diff --git a/server_test.go b/server_test.go index 4577a67..8853193 100644 --- a/server_test.go +++ b/server_test.go @@ -10,6 +10,7 @@ import ( "log" "net/http" "net/http/httptest" + "os" "testing" "golang.org/x/net/websocket" @@ -40,14 +41,18 @@ E2xc6bxzAlZGXQ== -----END EC PRIVATE KEY-----` ) -var server Server - func init() { + os.Remove(dataFile) server, err := NewServer(dataFile, wwwServer, tlsServer, rpcServer) if err != nil { log.Fatal(err) } - go server.Start() + go func() { + if err := server.Start(); err != nil { + log.Fatal(err) + } + }() + log.Println("start test server") } func get(uri string) (string, error) { @@ -114,23 +119,20 @@ func TestReverseProxy(t *testing.T) { } t.Log("add", e) - // normal connection resp, err := get("http://" + wwwServer) if err != nil { t.Error(err) } if !cannary.Equal(resp) { - t.Errorf("got %q expected %q", resp, cannary) + t.Errorf("normal: got %q expected %q", resp, cannary) } - // closed connection backServer.Close() resp, err = get("http://" + wwwServer) if err == nil || err.Error() != "500 Internal Server Error" { - t.Errorf("got %q expected %v", err, http.StatusInternalServerError) + t.Errorf("closed: got %q expected %v", err, http.StatusInternalServerError) } - // removed route if err := del(wwwServer); err != nil { t.Error(err) } @@ -138,7 +140,7 @@ func TestReverseProxy(t *testing.T) { resp, err = get("http://" + wwwServer) if err == nil || err.Error() != "404 Not Found" { - t.Errorf("got %q expected %v", err, http.StatusNotFound) + t.Errorf("removed: got %q expected %v", err, http.StatusNotFound) } } @@ -162,7 +164,6 @@ func TestReverseProxyTLS(t *testing.T) { if err != nil { t.Error(err) } - if !cannary.Equal(resp) { t.Errorf("got %q expected %q", resp, cannary) } -- cgit v1.2.3