Skip to content

Commit 731f626

Browse files
committed
TEST/MINOR: ssl: add sleep when changing a certificate in storage
1 parent ba497ad commit 731f626

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

e2e/tests/storage_ssl_certificates/test.bats

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ setup() {
4444

4545
assert_equal $(get_json_path "$BODY" '.storage_name') "1.pem"
4646

47+
sleep 3
48+
4749
assert dpa_docker_exec 'ls /etc/haproxy/ssl/1.pem'
4850

4951
post_logs_count=$(docker logs dataplaneapi-e2e 2>&1 | wc -l)
@@ -89,6 +91,7 @@ setup() {
8991
dpa_curl_status_body '$output'
9092
assert_equal "$SC" 202
9193

94+
sleep 3
9295
assert dpa_diff_docker_file '/etc/haproxy/ssl/1.pem' "data/2.pem"
9396
}
9497

@@ -102,6 +105,7 @@ setup() {
102105
dpa_curl_status_body '$output'
103106
assert_equal "$SC" 200
104107

108+
sleep 3
105109
# confirm haproxy wasn't reloaded or restarted
106110
post_logs_count=$(docker logs dataplaneapi-e2e 2>&1 | wc -l)
107111
new_logs_count=$(( $pre_logs_count - $post_logs_count ))
@@ -112,6 +116,7 @@ setup() {
112116
resource_delete "$_STORAGE_SSL_CERTS_BASE_PATH/1.pem"
113117
assert_equal "$SC" 202
114118

119+
sleep 3
115120
refute dpa_docker_exec 'ls /etc/haproxy/ssl/1.pem'
116121
}
117122

@@ -131,7 +136,7 @@ setup() {
131136

132137
@test "storage_ssl_certificates: Delete a ssl certificate file with skip reload" {
133138
#reupload cert file
134-
run dpa_curl_file_upload POST "$_STORAGE_SSL_CERTS_BASE_PATH" "@${BATS_TEST_DIRNAME}/data/1.pem;filename=1.pem"
139+
run dpa_curl_file_upload POST "$_STORAGE_SSL_CERTS_BASE_PATH" "@${BATS_TEST_DIRNAME}/data/1.pem;filename=7.pem"
135140
assert_success
136141

137142
dpa_curl_status_body '$output'
@@ -140,7 +145,8 @@ setup() {
140145
resource_delete "$_STORAGE_SSL_CERTS_BASE_PATH/1.pem" "skip_reload=true"
141146
assert_equal "$SC" 204
142147

143-
refute dpa_docker_exec 'ls /etc/haproxy/ssl/1.pem'
148+
sleep 3
149+
refute dpa_docker_exec 'ls /etc/haproxy/ssl/7.pem'
144150
}
145151

146152
@test "storage_ssl_certificates: Add a ssl certificate file with force reload" {
@@ -159,6 +165,8 @@ setup() {
159165

160166
assert_equal $(get_json_path "$BODY" '.storage_name') "1.pem"
161167

168+
sleep 3
169+
162170
assert dpa_docker_exec 'ls /etc/haproxy/ssl/1.pem'
163171

164172
post_logs_count=$(docker logs dataplaneapi-e2e 2>&1 | wc -l)

0 commit comments

Comments
 (0)