Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix unstable tests #342

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

fix unstable tests #342

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
02fc07b
add temp fix
mga-chka Jun 2, 2023
022cc94
improve logs in case of error
mga-chka Sep 4, 2023
80bb987
increase likelyhood to get an error
mga-chka Sep 4, 2023
35fbaab
remove fix to generate the initial error
mga-chka Sep 4, 2023
3a47491
add 2 quick & dirty fixes
mga-chka Sep 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 47 additions & 11 deletions main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,14 +516,30 @@ func TestServe(t *testing.T) {
"testdata/http.cache.yml",
func(t *testing.T) {
var buf bytes.Buffer
zw := gzip.NewWriter(&buf)
_, err := zw.Write([]byte("SELECT * FROM system.numbers LIMIT 10"))
checkErr(t, err)
zw.Close()
req, err := http.NewRequest("POST", "http://127.0.0.1:9090", &buf)
checkErr(t, err)
req.Header.Set("Content-Encoding", "gzip")
resp, err := http.DefaultClient.Do(req)
var err error
var resp *http.Response
var maxRetries = 10
// cf https://github.com/ContentSquare/chproxy/issues/341, this test sometimes failed on github action for an unknown reason
// we added a retry mecanism as a quick & dirty fix to make the CI stable
for i := 0; i < maxRetries; i++ {
if err != nil {
t.Logf("an error happened during the http gzipped POST request test, retrying it, error: %s", err)
time.Sleep(20 * time.Millisecond)
}
zw := gzip.NewWriter(&buf)
_, err = zw.Write([]byte("SELECT * FROM system.numbers LIMIT 10"))
checkErr(t, err)
zw.Close()
req, err := http.NewRequest("POST", "http://127.0.0.1:9090", &buf)
checkErr(t, err)
req.Header.Set("Content-Encoding", "gzip")
resp, err = http.DefaultClient.Do(req)

if err == nil {
break
}
}

checkErr(t, err)
body, _ := io.ReadAll(resp.Body)
if resp.StatusCode != http.StatusOK {
Expand All @@ -539,9 +555,25 @@ func TestServe(t *testing.T) {
"testdata/http.yml",
func(t *testing.T) {
buf := bytes.NewBufferString("SELECT * FROM system.numbers LIMIT 10")
req, err := http.NewRequest("POST", "http://127.0.0.1:9090", buf)
checkErr(t, err)
resp, err := http.DefaultClient.Do(req)
var err error
var resp *http.Response
var maxRetries = 10
// cf https://github.com/ContentSquare/chproxy/issues/341, this test sometimes failed on github action for an unknown reason
// we added a retry mecanism as a quick & dirty fix to make the CI stable
for i := 0; i < maxRetries; i++ {
if err != nil {
t.Logf("an error happened during the http POST request test, retrying it, error: %s", err)
time.Sleep(20 * time.Millisecond)
}
req, err := http.NewRequest("POST", "http://127.0.0.1:9090", buf)
checkErr(t, err)
resp, err = http.DefaultClient.Do(req)

if err == nil {
break
}
}

checkErr(t, err)
if resp.StatusCode != http.StatusOK {
t.Fatalf("unexpected status code: %d; expected: %d", resp.StatusCode, http.StatusOK)
Expand Down Expand Up @@ -1161,12 +1193,14 @@ func TestReloadConfig(t *testing.T) {
}

func checkErr(t *testing.T, err error) {
t.Helper()
if err != nil {
t.Fatalf("unexpected error: %s", err)
}
}

func getStringFromResponse(t *testing.T, r io.Reader) string {
t.Helper()
if r == nil {
t.Fatalf("unexpected nil reader")
}
Expand All @@ -1178,13 +1212,15 @@ func getStringFromResponse(t *testing.T, r io.Reader) string {
}

func checkResponse(t *testing.T, r io.Reader, expected string) {
t.Helper()
got := getStringFromResponse(t, r)
if !strings.Contains(got, expected) {
t.Fatalf("got: %q; expected: %q", got, expected)
}
}

func httpGet(t *testing.T, url string, statusCode int) *http.Response {
t.Helper()
resp, err := http.Get(url)
if err != nil {
t.Fatalf("unexpected erorr while doing GET request: %s", err)
Expand Down