bastif pushed to branch master at Debian Java Maintainers / css-validator
Commits: 7553297f by Fab Stz at 2026-02-14T15:57:16+01:00 update URL to Vcs to 'java-team/css-validator' - - - - - ea27b981 by Fab Stz at 2026-02-14T17:12:12+01:00 d/tests: wait until service is ready Trial to fix failure of autopkgtest on i386 & riscv64. - - - - - 3 changed files: - debian/control - debian/tests/control - debian/tests/webapp_validate_file.sh Changes: ===================================== debian/control ===================================== @@ -24,8 +24,8 @@ Build-Depends: libxerces2-java, velocity Standards-Version: 4.7.2 -Vcs-Browser: https://salsa.debian.org/bastif/css-validator -Vcs-Git: https://salsa.debian.org/bastif/css-validator.git +Vcs-Browser: https://salsa.debian.org/java-team/css-validator +Vcs-Git: https://salsa.debian.org/java-team/css-validator.git Homepage: https://jigsaw.w3.org/css-validator/ Package: css-validator ===================================== debian/tests/control ===================================== @@ -4,7 +4,7 @@ Restrictions: superficial, Test-Command: debian/tests/webapp_validate_file.sh "jetty9" Features: test-name=webapp:jetty9, -Depends: css-validator-jetty9, curl, +Depends: css-validator-jetty9, curl, netcat-openbsd, Restrictions: isolation-container, needs-sudo, superficial, # Know to fail. Skip until bin:jetty12 is fixed. @@ -12,19 +12,19 @@ Restrictions: isolation-container, needs-sudo, superficial, # * https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1108370 #Test-Command: debian/tests/webapp_validate_file.sh "jetty12" #Features: test-name=webapp:jetty12, -#Depends: css-validator-jetty12, curl, +#Depends: css-validator-jetty12, curl, netcat-openbsd, #Restrictions: isolation-container, needs-sudo, superficial, Test-Command: debian/tests/webapp_validate_file.sh "tomcat10" Features: test-name=webapp:tomcat10, -Depends: css-validator-tomcat10, curl, +Depends: css-validator-tomcat10, curl, netcat-openbsd, Restrictions: isolation-container, needs-sudo, superficial, # Known to fail. Skip until fixed upstream # https://github.com/w3c/css-validator/issues/455 #Test-Command: debian/tests/webapp_validate_file.sh "tomcat11" #Features: test-name=webapp:tomcat11, -#Depends: css-validator-tomcat11, curl, +#Depends: css-validator-tomcat11, curl, netcat-openbsd, #Restrictions: isolation-container, needs-sudo, superficial, Test-Command: debian/tests/webapp_validate_url.sh "tomcat11" ===================================== debian/tests/webapp_validate_file.sh ===================================== @@ -15,6 +15,30 @@ debug_failure() rm "$tempfile" } +wait_until_ready() +{ + server="$1" + port="$2" + count=0 + while ! nc -z localhost "${port:-8080}" >/dev/null 2>&1; do + if [ $count -gt 60 ]; then + break + fi + count=$((count + 1)) + sleep 1 + done + if [ ! $count -gt 60 ]; then + echo "$server is now up and running at http://localhost:${port:-8080}"; + echo "Startup took $count seconds." + exit + else + echo "$server failed starting up in less than 60 seconds" + exit 1 + fi +} + +PORT=8080 + if [ -n "$AUTOPKGTEST_TMP" ]; then case "$server" in tomcat10) @@ -26,10 +50,13 @@ if [ -n "$AUTOPKGTEST_TMP" ]; then esac sudo systemctl restart "$server" - sleep 5 + wait_until_ready "$server" "$PORT" sudo systemctl status "$server" fi + + + #echo "current path: $PWD" curl -v --stderr - \ @@ -40,7 +67,7 @@ curl -v --stderr - \ -F vextwarning= \ -F lang=en \ -o "$tempfile" \ - "http://localhost:8080/css-validator/validator"; + "http://localhost:${PORT:-8080}/css-validator/validator"; if grep "<h3>Congratulations! No Error Found.</h3>" "$tempfile"; then echo "Validation of file was successful." View it on GitLab: https://salsa.debian.org/java-team/css-validator/-/compare/09874f3a4d08b2d4c38bf0d63b217ed8a1775f1e...ea27b981e0b47116f279d5710313eeb9e847c831 -- View it on GitLab: https://salsa.debian.org/java-team/css-validator/-/compare/09874f3a4d08b2d4c38bf0d63b217ed8a1775f1e...ea27b981e0b47116f279d5710313eeb9e847c831 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
