Skip to content

Commit fa8ad65

Browse files
committed
BUG/MINOR: e2e: fix sites test
Since ordering of data is not guaranteed in sites, accessing properties by index caused flaky tests. Instead we just check if property exists or not.
1 parent c034833 commit fa8ad65

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

e2e/tests/sites/data/haproxy.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ defaults
2525
timeout http-keep-alive 10s
2626
retries 3
2727

28-
frontend test_site
28+
frontend myfrontend
2929
mode http
3030
maxconn 2000
3131
bind 127.0.0.1:9001

e2e/tests/sites/delete.bats

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ load '../../libs/version'
2424
load 'utils/_helpers'
2525

2626
@test "sites: Delete a site" {
27-
resource_delete "$_SITE_BASE_PATH/test_site" "force_reload=true"
27+
resource_delete "$_SITE_BASE_PATH/myfrontend" "force_reload=true"
2828
assert_equal "$SC" 204
2929

3030
resource_get "$_SITE_BASE_PATH/site"

e2e/tests/sites/list.bats

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@ load 'utils/_helpers'
3030
resource_get "$_SITE_BASE_PATH"
3131
assert_equal "$SC" 200
3232

33-
assert_equal "$(get_json_path "$BODY" ".data[0].name")" "test_site"
34-
assert_equal "$(get_json_path "$BODY" ".data[1].name")" "site"
33+
assert_equal "$(get_json_path "$BODY" " .data[] | select(.name | contains(\"myfrontend\") ).name" )" "myfrontend"
34+
assert_equal "$(get_json_path "$BODY" " .data[] | select(.name | contains(\"site\") ).name" )" "site"
3535
}

0 commit comments

Comments
 (0)