Skip to content

Commit 983d2ad

Browse files
mjuragamjuraga
committed
TEST/MINOR: e2e: remove debug traces
1 parent 97b010c commit 983d2ad

File tree

5 files changed

+1
-38
lines changed

5 files changed

+1
-38
lines changed

‎e2e/tests/crt_store/crt_store.bats

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,49 +32,41 @@ load 'utils/_helpers'
3232
@test "crt_store: all tests (>=3.0)" {
3333
haproxy_version_ge "3.0" || skip
3434

35-
debug "crt_store: create a new section"
3635
resource_post "$_CRT_STORE_PATH" "data/new_store.json" "force_reload=true"
3736
assert_equal "$SC" "201"
3837

39-
debug "crt_store: get a section"
4038
resource_get "$_CRT_STORE_PATH/$_STORE_NAME"
4139
assert_equal "$SC" "200"
4240
assert_equal "$_STORE_NAME" "$(get_json_path "$BODY" .name)"
4341
assert_equal "/secure/certs" "$(get_json_path "$BODY" .crt_base)"
4442
assert_equal "/secure/keys" "$(get_json_path "$BODY" .key_base)"
4543

46-
debug "crt_store: edit a section"
4744
resource_put "$_CRT_STORE_PATH/$_STORE_NAME" "data/edit_store.json" "force_reload=true"
4845
assert_equal "$SC" "200"
4946
resource_get "$_CRT_STORE_PATH/$_STORE_NAME"
5047
assert_equal "/sec" "$(get_json_path "$BODY" .key_base)"
5148

52-
debug "crt_store: get a list of sections"
5349
resource_get "$_CRT_STORE_PATH"
5450
assert_equal "$SC" "200"
5551
assert_equal "$_STORE_NAME" "$(get_json_path "$BODY" .[0].name)"
5652

57-
debug "crt_store: add load entries"
5853
resource_post "$_CRT_LOAD_PATH" "data/post_entry1.json" "crt_store=$_STORE_NAME"
5954
assert_equal "$SC" "202"
6055
resource_post "$_CRT_LOAD_PATH" "data/post_entry2.json" "crt_store=$_STORE_NAME"
6156
assert_equal "$SC" "202"
6257

63-
debug "crt_store: get a load entry"
6458
resource_get "$_CRT_LOAD_PATH/c1.pem" "crt_store=$_STORE_NAME"
6559
assert_equal "$SC" "200"
6660
assert_equal "c1.pem" "$(get_json_path "$BODY" .certificate)"
6761
assert_equal "k1.pem" "$(get_json_path "$BODY" .key)"
6862
assert_equal "disabled" "$(get_json_path "$BODY" .ocsp_update)"
6963

70-
debug "crt_store: get all load entries"
7164
resource_get "$_CRT_LOAD_PATH" "crt_store=$_STORE_NAME"
7265
assert_equal "$SC" "200"
7366
assert_equal "2" "$(get_json_path "$BODY" '.|length')"
7467
assert_equal "c1.pem" "$(get_json_path "$BODY" .[0].certificate)"
7568
assert_equal "c2.pem" "$(get_json_path "$BODY" .[1].certificate)"
7669

77-
debug "crt_store: modify a load entry"
7870
resource_put "$_CRT_LOAD_PATH/c2.pem" "data/put_entry.json" \
7971
"crt_store=$_STORE_NAME" "force_reload=true"
8072
assert_equal "$SC" "202"
@@ -83,15 +75,13 @@ load 'utils/_helpers'
8375
assert_equal "disabled" "$(get_json_path "$BODY" .ocsp_update)"
8476
assert_equal "example.com" "$(get_json_path "$BODY" .alias)"
8577

86-
debug "crt_store: delete a load entry"
8778
resource_delete "$_CRT_LOAD_PATH/c1.pem" "crt_store=$_STORE_NAME" "force_reload=true"
8879
assert_equal "$SC" "202"
8980
resource_delete "$_CRT_LOAD_PATH/c2.pem" "crt_store=$_STORE_NAME" "force_reload=true"
9081
assert_equal "$SC" "202"
9182
resource_get "$_CRT_LOAD_PATH/c2.pem" "crt_store=$_STORE_NAME"
9283
assert_equal "$SC" "404"
9384

94-
debug "crt_store: delete a section"
9585
resource_delete "$_CRT_STORE_PATH/$_STORE_NAME" "force_reload=true"
9686
assert_equal "$SC" "204"
9787
resource_get "$_CRT_STORE_PATH/$_STORE_NAME"

‎e2e/tests/log_profile/log_profile.bats

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,32 +27,27 @@ load 'utils/_helpers'
2727
@test "log_profile: all tests (>=3.1)" {
2828
haproxy_version_ge "3.1" || skip
2929

30-
debug "log_profile: create a new section"
3130
resource_post "$_LOG_PROFILE_PATH" "data/new_profile.json" "force_reload=true"
3231
assert_equal "$SC" "201"
3332

34-
debug "log_profile: get a section"
3533
resource_get "$_LOG_PROFILE_PATH/$_PROFILE_NAME"
3634
assert_equal "$SC" "200"
3735
assert_equal "$_PROFILE_NAME" "$(get_json_path "$BODY" .name)"
3836
assert_equal "tag1" "$(get_json_path "$BODY" .log_tag)"
3937
assert_equal "enabled" "$(get_json_path "$BODY" .steps.[0].drop)"
4038
assert_equal "any" "$(get_json_path "$BODY" .steps.[2].step)"
4139

42-
debug "log_profile: edit a section"
4340
resource_put "$_LOG_PROFILE_PATH/$_PROFILE_NAME" "data/edit_profile.json" "force_reload=true"
4441
assert_equal "$SC" "200"
4542
resource_get "$_LOG_PROFILE_PATH/$_PROFILE_NAME"
4643
assert_equal "tag2" "$(get_json_path "$BODY" .log_tag)"
4744
assert_equal "disabled" "$(get_json_path "$BODY" .steps.[0].drop)"
4845
assert_equal 2 "$(get_json_path "$BODY" '.steps|length')"
4946

50-
debug "log_profile: get a list of sections"
5147
resource_get "$_LOG_PROFILE_PATH"
5248
assert_equal "$SC" "200"
5349
assert_equal "$_PROFILE_NAME" "$(get_json_path "$BODY" .[0].name)"
5450

55-
debug "log_profile: delete a section"
5651
resource_delete "$_LOG_PROFILE_PATH/$_PROFILE_NAME" "force_reload=true"
5752
assert_equal "$SC" "204"
5853
resource_get "$_LOG_PROFILE_PATH/$_PROFILE_NAME"

‎e2e/tests/ssl_front_use/test.bats

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,32 +32,27 @@ cert=/etc/haproxy/ssl/cert.pem
3232

3333
run docker cp "${BATS_TEST_DIRNAME}/data/3.pem" "${DOCKER_CONTAINER_NAME}:$cert"
3434

35-
# debug "ssl-f-use: create"
3635
resource_post "$(ssl_front_uses_path front1)" "data/post.json"
3736
assert_equal "$SC" "202"
3837

39-
# debug "ssl-f-use: get all"
4038
resource_get "$(ssl_front_uses_path front1)"
4139
assert_equal "$SC" "200"
4240
assert_equal "$(get_json_path "$BODY" '.|length')" 1
4341
assert_equal "$(get_json_path "$BODY" '.[0].certificate')" "$cert"
4442
assert_equal "$(get_json_path "$BODY" '.[0].allow_0rtt')" true
4543

46-
# debug "ssl-f-use: get one"
4744
resource_get "$(ssl_front_uses_path front1 0)"
4845
assert_equal "$SC" "200"
4946
assert_equal "$(get_json_path "$BODY" '.certificate')" "$cert"
5047
assert_equal "$(get_json_path "$BODY" '.allow_0rtt')" true
5148

52-
# debug "ssl-f-use: edit"
5349
resource_put "$(ssl_front_uses_path front1 0)" "data/put.json"
5450
assert_equal "$SC" "202"
5551
assert_equal "$(get_json_path "$BODY" '.certificate')" "$cert"
5652
assert_equal "$(get_json_path "$BODY" '.allow_0rtt')" null
5753
assert_equal "$(get_json_path "$BODY" '.no_alpn')" true
5854
assert_equal "$(get_json_path "$BODY" '.verify')" none
5955

60-
# debug "ssl-f-use: delete"
6156
resource_delete "$(ssl_front_uses_path front1 0)"
6257
assert_equal "$SC" "202"
6358
resource_get "$(ssl_front_uses_path front1)"

‎e2e/tests/storage_ssl_crt_lists/test.bats

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ load 'utils/_helpers'
3232
# to /etc/haproxy/ssl during setup for some reason.
3333
dpa_docker_exec 'mv /ssl/* /etc/haproxy/ssl'
3434

35-
debug "crt-list: upload a new list"
3635
assert dpa_docker_exec 'ls /etc/haproxy/ssl/crt-list.txt'
3736
refute dpa_docker_exec 'ls /etc/haproxy/ssl/crt-list2.txt'
3837
run dpa_curl_file_upload POST "$_STORAGE_SSL_CRT_LIST_PATH" "@$BATS_TEST_DIRNAME/data/crt-list2.txt;filename=crt-list2.txt"
@@ -42,28 +41,23 @@ load 'utils/_helpers'
4241
assert_equal "$(get_json_path "$BODY" '.storage_name')" 'crt-list2.txt'
4342
assert dpa_docker_exec 'ls /etc/haproxy/ssl/crt-list2.txt'
4443

45-
debug "crt-list files: replace a crt-list"
4644
run dpa_curl_text_plain PUT "$_STORAGE_SSL_CRT_LIST_PATH/crt-list2.txt" "@$BATS_TEST_DIRNAME/data/crt-list2.txt"
4745
assert_success
4846
dpa_curl_status_body '$output'
4947
assert_equal "$SC" 202
5048

51-
debug "crt-list files: get a list of crt-list files"
5249
resource_get "$_STORAGE_SSL_CRT_LIST_PATH"
5350
assert_equal "$SC" 200
5451
# [{"description":"managed certificate list","file":"/etc/haproxy/ssl/crt-list2.txt","storage_name":"crt-list2.txt"}]
5552
assert_equal "$(get_json_path "$BODY" '.[0].file')" '/etc/haproxy/ssl/crt-list.txt'
5653
assert_equal "$(get_json_path "$BODY" '.|length')" 2
5754

58-
debug "crt-list files: get a single crt-list"
5955
resource_get "$_STORAGE_SSL_CRT_LIST_PATH/crt-list2.txt"
6056
test "$BODY" = "$(cat $BATS_TEST_DIRNAME/data/crt-list2.txt)" || fail
6157

62-
debug "crt-list files: delete a list"
6358
resource_delete "$_STORAGE_SSL_CRT_LIST_PATH/crt-list2.txt"
6459
assert_equal "$SC" 202
6560

66-
debug "crt-list files: ensure the file has been deleted"
6761
resource_get "$_STORAGE_SSL_CRT_LIST_PATH"
6862
assert_equal "$SC" 200
6963
assert_equal "$(get_json_path "$BODY" '.|length')" 1
@@ -72,26 +66,21 @@ load 'utils/_helpers'
7266
@test "storage crt-list entries: all tests" {
7367
dpa_docker_exec 'mv /ssl/* /etc/haproxy/ssl'
7468

75-
debug "crt-list entries: get the list of entries (1)"
7669
resource_get "$_STORAGE_SSL_CRT_LIST_PATH/crt-list.txt/entries"
7770
assert_equal "$SC" 200
7871
assert_equal "$(get_json_path "$BODY" '.|length')" 1
7972

80-
debug "crt-list entries: add a new entry"
8173
resource_post "$_STORAGE_SSL_CRT_LIST_PATH/crt-list.txt/entries" "data/post.json"
8274
assert_equal "$SC" 201
8375
assert_equal "$(get_json_path "$BODY" '.file')" '/etc/haproxy/ssl/1.pem'
8476

85-
debug "crt-list entries: get the list of entries (2)"
8677
resource_get "$_STORAGE_SSL_CRT_LIST_PATH/crt-list.txt/entries"
8778
assert_equal "$SC" 200
8879
assert_equal "$(get_json_path "$BODY" '.|length')" 2
89-
90-
debug "crt-list entries: delete an entry"
80+
9181
resource_delete "$_STORAGE_SSL_CRT_LIST_PATH/crt-list.txt/entries" "certificate=/etc/haproxy/ssl/1.pem&line_number=1"
9282
assert_equal "$SC" 204
9383

94-
debug "crt-list entries: get the list of entries (3)"
9584
resource_get "$_STORAGE_SSL_CRT_LIST_PATH/crt-list.txt/entries"
9685
assert_equal "$SC" 200
9786
assert_equal "$(get_json_path "$BODY" '.|length')" 1

‎e2e/tests/traces/traces.bats

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,27 +28,23 @@ load 'utils/_helpers'
2828
@test "traces: get/create/modify/delete (>=3.1)" {
2929
haproxy_version_ge "3.1" || skip
3030

31-
debug "traces: create section"
3231
resource_post "$_TRACES_PATH" "data/new_section.json" "force_reload=true"
3332
assert_equal "$SC" "201"
3433

35-
debug "traces: get section"
3634
resource_get "$_TRACES_PATH"
3735
assert_equal "$SC" "200"
3836
assert_equal "h1 sink stderr level developer verbosity complete start now" \
3937
"$(get_json_path "$BODY" .entries[0].trace)"
4038
assert_equal "h2 sink stderr level developer verbosity complete start now" \
4139
"$(get_json_path "$BODY" .entries[1].trace)"
4240

43-
debug "traces: replace section"
4441
resource_put "$_TRACES_PATH" "data/replace_section.json" "force_reload=true"
4542
assert_equal "$SC" "200"
4643
resource_get "$_TRACES_PATH"
4744
assert_equal "fcgi sink stderr level developer verbosity quiet start now" \
4845
"$(get_json_path "$BODY" .entries[0].trace)"
4946

5047

51-
debug "traces: add trace entries"
5248
resource_post "$_TRACE_ENTRIES_PATH" "data/entry1.json"
5349
assert_equal "$SC" "202"
5450
resource_post "$_TRACE_ENTRIES_PATH" "data/entry2.json"
@@ -61,13 +57,11 @@ load 'utils/_helpers'
6157
assert_equal "check sink stderr level developer verbosity quiet start now" \
6258
"$(get_json_path "$BODY" .entries[2].trace)"
6359

64-
debug "traces: delete entries"
6560
resource_delete_body "$_TRACE_ENTRIES_PATH" "data/entry1.json" "force_reload=true"
6661
assert_equal "$SC" "204"
6762
resource_delete_body "$_TRACE_ENTRIES_PATH" "data/entry2.json" "force_reload=true"
6863
assert_equal "$SC" "204"
6964

70-
debug "traces: delete section"
7165
resource_delete "$_TRACES_PATH" "force_reload=true"
7266
assert_equal "$SC" "204"
7367
resource_get "$_TRACES_PATH"

0 commit comments

Comments
 (0)