Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: clean up test project on signal, fixes #6111 #6119

Merged
merged 5 commits into from
Apr 24, 2024

Conversation

rfay
Copy link
Member

@rfay rfay commented Apr 21, 2024

The Issue

How This PR Solves The Issue

  • Catch signal and clean up on exit
  • Check docker build-time connectivity to internet

Manual Testing Instructions

  • Ctrl-C during run, it should clean up or give a good try
  • It should completely clean up after a normal run
  • If not internet is available, or google.com not accessible, the failure should show

Copy link
Member

@stasadev stasadev left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested

  • Ctrl-C during run, it should clean up or give a good try
  • It should completely clean up after a normal run
  • If not internet is available, or google.com not accessible, the failure should show

Thanks!


Minor notes:

  1. There is one more hard-coded port 60004.

  2. $router_http_port and $router_https_port are not used in the script:

router_http_port=$(ddev config global -j | docker run -i --rm ddev/ddev-utilities jq -r '.raw."router-http-port"' 2>/dev/null)
router_https_port=$(ddev config global -j | docker run -i --rm ddev/ddev-utilities jq -r '.raw."router-https-port"' 2>/dev/null)

  1. A typo in healtcheck > healthcheck
    printf "============= ddev-${PROJECT_NAME}-web healtcheck run =========\n" && \

cmd/ddev/cmd/scripts/test_ddev.sh Outdated Show resolved Hide resolved
@rfay rfay marked this pull request as ready for review April 23, 2024 21:38
@rfay rfay requested a review from a team as a code owner April 23, 2024 21:38
@rfay
Copy link
Member Author

rfay commented Apr 23, 2024

Thanks for the careful review!

  • Removed extraneous environment variables
  • Added curl of the webserver http bind port

@rfay rfay requested a review from stasadev April 23, 2024 21:39
cmd/ddev/cmd/scripts/test_ddev.sh Outdated Show resolved Hide resolved
cmd/ddev/cmd/scripts/test_ddev.sh Show resolved Hide resolved
cmd/ddev/cmd/scripts/test_ddev.sh Outdated Show resolved Hide resolved
@rfay
Copy link
Member Author

rfay commented Apr 24, 2024

Thanks for your eagle eye!

Copy link
Member

@stasadev stasadev left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested again, all good 👍

@rfay rfay merged commit 214c160 into ddev:master Apr 24, 2024
18 checks passed
@rfay rfay deleted the 20240420_ddev_debug_test branch April 24, 2024 22:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants