Skip to content

Commit 69c4397

Browse files
authored
bugfix: use smoke instead of flog (#104)
- Using smoke to ingest data instead of flog - Also, calling /schema in the set alert test due to some weird issues with schema not being updated
1 parent fecfba7 commit 69c4397

File tree

1 file changed

+30
-6
lines changed

1 file changed

+30
-6
lines changed

quest_test.go

Lines changed: 30 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -384,26 +384,50 @@ func TestSmokeSetTarget(t *testing.T) {
384384
}
385385

386386
func TestSmokeSetAlert(t *testing.T) {
387-
CreateStream(t, NewGlob.QueryClient, NewGlob.Stream)
387+
stream := NewGlob.Stream + "alert_testing"
388+
CreateStream(t, NewGlob.QueryClient, stream)
388389
if NewGlob.IngestorUrl.String() == "" {
389-
RunFlog(t, NewGlob.QueryClient, NewGlob.Stream)
390+
cmd := exec.Command("k6",
391+
"run",
392+
"-e", fmt.Sprintf("P_URL=%s", NewGlob.QueryUrl.String()),
393+
"-e", fmt.Sprintf("P_USERNAME=%s", NewGlob.QueryUsername),
394+
"-e", fmt.Sprintf("P_PASSWORD=%s", NewGlob.QueryPassword),
395+
"-e", fmt.Sprintf("P_STREAM=%s", stream),
396+
"./scripts/smoke.js")
397+
398+
cmd.Run()
399+
cmd.Output()
390400
} else {
391-
RunFlog(t, NewGlob.IngestorClient, NewGlob.Stream)
401+
cmd := exec.Command("k6",
402+
"run",
403+
"-e", fmt.Sprintf("P_URL=%s", NewGlob.IngestorUrl.String()),
404+
"-e", fmt.Sprintf("P_USERNAME=%s", NewGlob.IngestorUsername),
405+
"-e", fmt.Sprintf("P_PASSWORD=%s", NewGlob.IngestorPassword),
406+
"-e", fmt.Sprintf("P_STREAM=%s", stream),
407+
"./scripts/smoke.js")
408+
409+
cmd.Run()
410+
cmd.Output()
392411
}
412+
time.Sleep(120 * time.Second)
413+
schemaReq, _ := NewGlob.QueryClient.NewRequest("GET", "/logstream/"+stream+"/schema", nil)
414+
schemaResponse, _ := NewGlob.QueryClient.Do(schemaReq)
415+
require.Equalf(t, 200, schemaResponse.StatusCode, "Server returned http code: %s and response: %s", schemaResponse.Status, readAsString(schemaResponse.Body))
393416
req, _ := NewGlob.QueryClient.NewRequest("GET", "/targets", nil)
394417
response, err := NewGlob.QueryClient.Do(req)
395418
require.NoErrorf(t, err, "Request failed: %s", err)
396419
bodyTargets, _ := io.ReadAll(response.Body)
397420
reader1 := bytes.NewReader(bodyTargets)
398421
targetId := getIdFromTargetResponse(reader1)
399-
body := getAlertBody(NewGlob.Stream, targetId)
422+
body := getAlertBody(stream, targetId)
400423
req, _ = NewGlob.QueryClient.NewRequest("POST", "/alerts", strings.NewReader(body))
401424
response, err = NewGlob.QueryClient.Do(req)
402425
require.NoErrorf(t, err, "Request failed: %s", err)
403426
require.Equalf(t, 200, response.StatusCode, "Server returned http code: %s and response: %s", response.Status, readAsString(response.Body))
404427
}
405428

406429
func TestSmokeGetAlert(t *testing.T) {
430+
stream := NewGlob.Stream + "alert_testing"
407431
req, _ := NewGlob.QueryClient.NewRequest("GET", "/targets", nil)
408432
response, err := NewGlob.QueryClient.Do(req)
409433
require.NoErrorf(t, err, "Request failed: %s", err)
@@ -419,11 +443,11 @@ func TestSmokeGetAlert(t *testing.T) {
419443
expected := readAsString(reader1)
420444
id, state := getIdStateFromAlertResponse(reader2)
421445
require.Equalf(t, 200, response.StatusCode, "Server returned http code: %s and response: %s", response.Status, body)
422-
res := createAlertResponse(id, state, NewGlob.Stream, targetId)
446+
res := createAlertResponse(id, state, stream, targetId)
423447
require.JSONEq(t, expected, res, "Get alert response doesn't match with Alert config returned")
424448
DeleteAlert(t, NewGlob.QueryClient, id)
425449
DeleteTarget(t, NewGlob.QueryClient, targetId)
426-
DeleteStream(t, NewGlob.QueryClient, NewGlob.Stream)
450+
DeleteStream(t, NewGlob.QueryClient, stream)
427451
}
428452

429453
func TestSmokeSetRetention(t *testing.T) {

0 commit comments

Comments
 (0)