aboutsummaryrefslogtreecommitdiff
path: root/server_test.go
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2016-04-04 01:33:02 +0200
committerDimitri Sokolyuk <demon@dim13.org>2016-04-04 01:33:02 +0200
commite4324fd473bf878306b3df387bd1bea08cdd604c (patch)
treef3005edbe48d10ed1958d8eef399cc51a0f70a7f /server_test.go
parentb9b8a680bae0590bfaeb954aee56b2057db41b1a (diff)
kiss
Diffstat (limited to 'server_test.go')
-rw-r--r--server_test.go44
1 files changed, 22 insertions, 22 deletions
diff --git a/server_test.go b/server_test.go
index 82e35e1..c87a37d 100644
--- a/server_test.go
+++ b/server_test.go
@@ -79,13 +79,13 @@ func get(uri string) (string, error) {
return string(body), nil
}
-func add(e Entry) error {
+func add(r Route) error {
client, err := DialRPC(rpcServer)
if err != nil {
return err
}
defer client.Close()
- return client.Call("GoXY.Add", e, nil)
+ return client.Call("GoXY.Add", r, nil)
}
func del(host string) error {
@@ -109,16 +109,16 @@ func TestReverseProxy(t *testing.T) {
backServer := httptest.NewServer(cannary)
t.Log("run", backServer.URL)
- e := Entry{
+ r := Route{
Host: "http://" + wwwServer,
Upstream: backServer.URL,
}
- if err := add(e); err != nil {
+ if err := add(r); err != nil {
t.Error(err)
}
- t.Log("add", e.Host)
+ t.Log("add", r.Host)
- resp, err := get(e.Host)
+ resp, err := get(r.Host)
if err != nil {
t.Error(err)
}
@@ -127,17 +127,17 @@ func TestReverseProxy(t *testing.T) {
}
backServer.Close()
- resp, err = get(e.Host)
+ resp, err = get(r.Host)
if err == nil || err.Error() != "500 Internal Server Error" {
t.Errorf("closed: got %q expected %v", err, http.StatusInternalServerError)
}
- t.Log("del", e.Host)
- if err := del(e.Host); err != nil {
+ t.Log("del", r.Host)
+ if err := del(r.Host); err != nil {
t.Error(err)
}
- resp, err = get(e.Host)
+ resp, err = get(r.Host)
if err == nil || err.Error() != "404 Not Found" {
t.Errorf("removed: got %q expected %v", err, http.StatusNotFound)
}
@@ -148,18 +148,18 @@ func TestReverseProxyTLS(t *testing.T) {
defer backServer.Close()
t.Log("run", backServer.URL)
- e := Entry{
+ r := Route{
Host: "https://" + tlsServer,
Upstream: backServer.URL,
Cert: []byte(cert),
Key: []byte(key),
}
- if err := add(e); err != nil {
+ if err := add(r); err != nil {
t.Error(err)
}
- t.Log("add", e.Host)
+ t.Log("add", r.Host)
- resp, err := get(e.Host)
+ resp, err := get(r.Host)
if err != nil {
t.Error(err)
}
@@ -167,8 +167,8 @@ func TestReverseProxyTLS(t *testing.T) {
t.Errorf("got %q expected %q", resp, cannary)
}
- t.Log("del", e.Host)
- if err := del(e.Host); err != nil {
+ t.Log("del", r.Host)
+ if err := del(r.Host); err != nil {
t.Error(err)
}
}
@@ -181,16 +181,16 @@ func TestWebsocketProxy(t *testing.T) {
t.Log("run", wsServer.URL)
// Test WebSocket proxy
- e := Entry{
+ r := Route{
Host: "ws://" + wwwServer,
Upstream: wsServer.URL,
}
- if err := add(e); err != nil {
+ if err := add(r); err != nil {
t.Error(err)
}
- t.Log("add", e.Host)
+ t.Log("add", r.Host)
- ws, err := websocket.Dial(e.Host, "", "http://localhost")
+ ws, err := websocket.Dial(r.Host, "", "http://localhost")
if err != nil {
t.Error(err)
}
@@ -207,8 +207,8 @@ func TestWebsocketProxy(t *testing.T) {
t.Errorf("got %q expected %q", string(msg), cannary)
}
- t.Log("del", e.Host)
- if err := del(e.Host); err != nil {
+ t.Log("del", r.Host)
+ if err := del(r.Host); err != nil {
t.Error(err)
}
}