aboutsummaryrefslogtreecommitdiff
path: root/server_test.go
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2016-03-28 15:51:40 +0200
committerDimitri Sokolyuk <demon@dim13.org>2016-03-28 15:51:40 +0200
commit9a4e0f70c967c3905e4430824f420ce2dd68a92f (patch)
treed142dff9687d12b1fcb2fd2666f77795fead8d75 /server_test.go
parentd97fab561070205d57f756015cf9e85a559a573e (diff)
Pass test
Diffstat (limited to 'server_test.go')
-rw-r--r--server_test.go25
1 files changed, 16 insertions, 9 deletions
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)
}