From 9a4e0f70c967c3905e4430824f420ce2dd68a92f Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Mon, 28 Mar 2016 15:51:40 +0200 Subject: Pass test --- server_test.go | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) (limited to 'server_test.go') diff --git a/server_test.go b/server_test.go index d0920c5..b83edcd 100644 --- a/server_test.go +++ b/server_test.go @@ -12,10 +12,10 @@ import ( const cannary = "hello from backend" func TestNewServer(t *testing.T) { - backendServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + backServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { io.WriteString(w, cannary) })) - defer backendServer.Close() + defer backServer.Close() server, err := NewServer("") if err != nil { @@ -30,23 +30,30 @@ func TestNewServer(t *testing.T) { t.Error(err) } - err = Add(Entry{ServerName: "whatever", Upstream: backendServer.URL}, rpcURL.Host) + frontServer := httptest.NewServer(nil) if err != nil { t.Error(err) } - - frontendServer := httptest.NewServer(server.Handler) + frontURL, err := url.Parse(frontServer.URL) if err != nil { t.Error(err) } - client := &http.Client{} - req, err := http.NewRequest("GET", frontendServer.URL, nil) + rpcClient, err := DialRPC(rpcURL.Host) + if err != nil { + t.Error(err) + } + err = rpcClient.Call("GoXY.Add", Entry{ + ServerName: frontURL.Host, + Upstream: backServer.URL, + }, nil) if err != nil { t.Error(err) } - req.Header.Set("Host", "whatever") - resp, err := client.Do(req) + + frontServer.Config.Handler = server.Handler + + resp, err := http.Get(frontServer.URL) if err != nil { t.Error(err) } -- cgit v1.2.3