umputun/reproxy
1
1
Fork 0
mirror of https://github.com/umputun/reproxy.git synced 2024-08-16 12:10:31 +03:00
Code Issues Projects Releases Wiki Activity

simplify unnecessary complicated TestCheckHealth

Browse Source
This commit is contained in:
Umputun 2021-07-08 17:08:35 -05:00
parent cd41237fa5
commit 9218ad8bac
2 changed files with 11 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/discovery/discovery.go
View File

@ -293,7 +293,7 @@ func (s *Service) CheckHealth() (pingResult map[string]error) {
errMsg, err := m.ping()
if err != nil {
log.Print(errMsg)
log.Printf("[DEBUG] %s", errMsg)
}
outCh <- pingError{m.PingURL, err}
}(m)
@ -478,11 +478,11 @@ func (m URLMapper) ping() (string, error) {
resp, err := client.Get(m.PingURL)
if err != nil {
errMsg := strings.Replace(err.Error(), "\"", "", -1)
errMsg = fmt.Sprintf("[WARN] failed to ping for health %s, %s", m.PingURL, errMsg)
errMsg = fmt.Sprintf("failed to ping for health %s, %s", m.PingURL, errMsg)
return errMsg, fmt.Errorf("%s %s: %s, %v", m.Server, m.SrcMatch.String(), m.PingURL, errMsg)
}
if resp.StatusCode != http.StatusOK {
errMsg := fmt.Sprintf("[WARN] failed ping status for health %s (%s)", m.PingURL, resp.Status)
errMsg := fmt.Sprintf("failed ping status for health %s (%s)", m.PingURL, resp.Status)
return errMsg, fmt.Errorf("%s %s: %s, %s", m.Server, m.SrcMatch.String(), m.PingURL, resp.Status)
}

41
app/discovery/discovery_test.go
View File

@ -444,8 +444,7 @@ func Test_ping(t *testing.T) {
}
func TestCheckHealth(t *testing.T) {
port := rand.Intn(10000) + 40000
failPingULR := fmt.Sprintf("http://127.0.0.1:%d", port)
failPingULR := "http://127.0.0.1:4321"
ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
w.Write([]byte("OK"))
@ -493,41 +492,17 @@ func TestCheckHealth(t *testing.T) {
},
}
svc := NewService([]Provider{p1, p2, p3}, time.Millisecond*10)
svc := NewService([]Provider{p1, p2, p3}, time.Millisecond*50)
ctx, cancel := context.WithTimeout(context.Background(), 500*time.Millisecond)
defer cancel()
_ = svc.Run(ctx)
mappers := svc.Mappers()
fmt.Println(mappers)
t.Logf("mappers: %v", mappers)
tests := []struct {
name string
want map[string]error
}{
{name: "case 1",
want: map[string]error{
ts.URL: nil,
ts2.URL: nil,
failPingULR: fmt.Errorf("some error"),
},
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
got := svc.CheckHealth()
for pingURL, err := range got {
wantErr, ok := tt.want[pingURL]
if !ok {
t.Errorf("CheckHealth() = ping URL %s not found in test case", pingURL)
continue
}
if (err != nil && wantErr == nil) ||
(err == nil && wantErr != nil) {
t.Errorf("CheckHealth() error = %v, wantErr %v", err, wantErr)
}
}
})
}
res := svc.CheckHealth()
assert.Equal(t, 3, len(res))
assert.Error(t, res[failPingULR])
assert.NoError(t, res[ts.URL])
assert.NoError(t, res[ts2.URL])
}