1
0
Fork 0

Tighten a join test further

master
Philip O Toole 8 years ago
parent 61ab3138ae
commit 1225885aa5

@ -76,8 +76,10 @@ func Test_DoubleJoinOKSecondNodeRedirect(t *testing.T) {
ts1 := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { ts1 := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
})) }))
defer ts1.Close() defer ts1.Close()
redirectAddr := fmt.Sprintf("%s%s", ts1.URL, "/join")
ts2 := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { ts2 := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
http.Redirect(w, r, fmt.Sprintf("%s%s", ts1.URL, "/join"), http.StatusMovedPermanently) http.Redirect(w, r, redirectAddr, http.StatusMovedPermanently)
})) }))
defer ts2.Close() defer ts2.Close()
@ -85,7 +87,7 @@ func Test_DoubleJoinOKSecondNodeRedirect(t *testing.T) {
if err != nil { if err != nil {
t.Fatalf("failed to join a single node: %s", err.Error()) t.Fatalf("failed to join a single node: %s", err.Error())
} }
if j != ts1.URL+"/join" { if j != redirectAddr {
t.Fatalf("node joined using wrong endpoint, exp: %s, got: %s", j, ts2.URL) t.Fatalf("node joined using wrong endpoint, exp: %s, got: %s", redirectAddr, j)
} }
} }

Loading…
Cancel
Save