From f0c79859705c7dca89209bf6232a97f61252741c Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 18 Jan 2024 22:47:07 -0500 Subject: [PATCH 1/3] fix: update haproxy tests so they pass --- tests/unit/haproxy.bats | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/unit/haproxy.bats b/tests/unit/haproxy.bats index dc4f09218..1d8eb4e37 100644 --- a/tests/unit/haproxy.bats +++ b/tests/unit/haproxy.bats @@ -88,17 +88,18 @@ teardown() { echo "status: $status" assert_success - run /bin/bash -c "curl --silent $TEST_APP.${DOKKU_DOMAIN}" + run /bin/bash -c "dokku logs $TEST_APP" echo "output: $output" echo "status: $status" assert_success - assert_output "python/http.server" - run /bin/bash -c "curl --silent $TEST_APP-2.${DOKKU_DOMAIN}" + run /bin/bash -c "docker logs haproxy-haproxy-1" echo "output: $output" echo "status: $status" assert_success - assert_output "python/http.server" + + assert_http_localhost_response "http" "$TEST_APP.$DOKKU_DOMAIN" "80" "/" "python/http.server" + assert_http_localhost_response "http" "$TEST_APP-2.$DOKKU_DOMAIN" "80" "/" "python/http.server" } @test "(haproxy) ssl" { From 193798b9e6edb2643c94ddd76d0d307d9c4567d3 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 18 Jan 2024 23:49:06 -0500 Subject: [PATCH 2/3] debug: check on all hosts --- tests/unit/haproxy.bats | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/unit/haproxy.bats b/tests/unit/haproxy.bats index 1d8eb4e37..8a2c32c82 100644 --- a/tests/unit/haproxy.bats +++ b/tests/unit/haproxy.bats @@ -93,6 +93,11 @@ teardown() { echo "status: $status" assert_success + run /bin/bash -c "dokku ps:inspect $TEST_APP" + echo "output: $output" + echo "status: $status" + assert_success + run /bin/bash -c "docker logs haproxy-haproxy-1" echo "output: $output" echo "status: $status" From 464019f439c2bd162f52eebef95cf1a03378f809 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Fri, 19 Jan 2024 02:09:55 -0500 Subject: [PATCH 3/3] tests: sleep for a bit before testing haproxy --- tests/unit/haproxy.bats | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/unit/haproxy.bats b/tests/unit/haproxy.bats index 8a2c32c82..afd3ffe02 100644 --- a/tests/unit/haproxy.bats +++ b/tests/unit/haproxy.bats @@ -88,6 +88,8 @@ teardown() { echo "status: $status" assert_success + sleep 5 + run /bin/bash -c "dokku logs $TEST_APP" echo "output: $output" echo "status: $status"