spacebar/kamal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify messages and remove multiple execute error

Browse Source
This commit is contained in:
Donal McBreen
2024-05-21 10:40:01 +01:00
parent fa7e941648
commit 706b82baa1
6 changed files with 32 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
test/cli/app_test.rb
View File

@@ -136,11 +136,11 @@ class CliAppTest < CliTestCase
.returns("running").at_least_once # workers health check
run_command("boot", config: :with_roles, host: nil).tap do |output|
assert_match "Waiting for a healthy web container (1.1.1.3)...", output
assert_match "Waiting for a healthy web container (1.1.1.4)...", output
assert_match "First web container is healthy, continuing (1.1.1.3)", output
assert_match "First web container is healthy, continuing (1.1.1.4)", output
end
assert_match "Waiting for the first healthy web container before booting workers on 1.1.1.3...", output
assert_match "Waiting for the first healthy web container before booting workers on 1.1.1.4...", output
assert_match "First web container is healthy, booting workers on 1.1.1.3", output
assert_match "First web container is healthy, booting workers on 1.1.1.4", output
end
end
test "boot with web barrier closed" do
@@ -156,14 +156,12 @@ class CliAppTest < CliTestCase
stderred do
run_command("boot", config: :with_roles, host: nil, allow_execute_error: true).tap do |output|
assert_match "Waiting for a healthy web container (1.1.1.3)...", output
assert_match "Waiting for a healthy web container (1.1.1.4)...", output
assert_match "First web container is unhealthy, stopping (1.1.1.3)", output
assert_match "First web container is unhealthy, stopping (1.1.1.4)", output
assert_match "Waiting for the first healthy web container before booting workers on 1.1.1.3...", output
assert_match "Waiting for the first healthy web container before booting workers on 1.1.1.4...", output
assert_match "First web container is unhealthy, not booting workers on 1.1.1.3", output
assert_match "First web container is unhealthy, not booting workers on 1.1.1.4", output
assert_match "Running docker container ls --all --filter name=^app-web-latest$ --quiet | xargs docker stop on 1.1.1.1", output
assert_match "Running docker container ls --all --filter name=^app-web-latest$ --quiet | xargs docker stop on 1.1.1.2", output
assert_match "Running docker container ls --all --filter name=^app-workers-latest$ --quiet | xargs docker stop on 1.1.1.3", output
assert_match "Running docker container ls --all --filter name=^app-workers-latest$ --quiet | xargs docker stop on 1.1.1.4", output
end
end
ensure

6
test/integration/broken_deploy_test.rb
View File

@@ -25,9 +25,9 @@ class BrokenDeployTest < IntegrationTest
private
def assert_failed_deploy(output)
assert_match "Waiting for a healthy web container (vm3)...", output
assert_match /First #{KAMAL.primary_role} container is unhealthy, stopping \(vm[12]\)/, output
assert_match "First #{KAMAL.primary_role} container unhealthy, stopping other roles (vm3)...", output
assert_match "Waiting for the first healthy web container before booting workers on vm3...", output
assert_match /First web container is unhealthy on vm[12], not booting other roles/, output
assert_match "First web container is unhealthy, not booting workers on vm3", output
assert_match "nginx: [emerg] unexpected end of file, expecting \";\" or \"}\" in /etc/nginx/conf.d/default.conf:2", output
assert_match 'ERROR {"Status":"unhealthy","FailingStreak":0,"Log":[]}', output
end