[Git][java-team/css-validator][master] 3 commits: Release 0~20250226+dfsg-2~exp3 to experimental

[bastif (@bastif)]

bastif pushed to branch master at Debian Java Maintainers / css-validator


Commits:
f76317dd by Fab Stz at 2026-03-03T14:38:31+01:00
Release 0~20250226+dfsg-2~exp3 to experimental

- - - - -
8e2ae75b by Fab Stz at 2026-03-03T19:45:17+01:00
d/tests: move common code to start_server() function

- - - - -
0ff46541 by Fab Stz at 2026-03-04T10:56:08+01:00
d/t/webapp_validate_common.sh: merge changes from vnu package

- - - - -


4 changed files:

- debian/changelog
- debian/tests/webapp_validate_common.sh
- debian/tests/webapp_validate_file.sh
- debian/tests/webapp_validate_url.sh


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+css-validator (0~20250226+dfsg-2~exp3) experimental; urgency=medium
+
+  * d/test: improve reliability of tests
+
+ -- Fab Stz <fabstz-it at yahoo.fr>  Tue, 03 Mar 2026 14:37:42 +0100
+
 css-validator (0~20250226+dfsg-2~exp2) experimental; urgency=medium
 
   * Enable autopkgtest of css-validator-jetty12


=====================================
debian/tests/webapp_validate_common.sh
=====================================
@@ -8,6 +8,9 @@ debug_failure()
 {
   sudo systemctl status "$server" || true
   sudo journalctl --no-pager -t "$server"
+  if [ "$server" = "jetty12" ]; then
+    sudo cat /var/log/jetty12/"$(sudo ls -t1 /var/log/jetty12/ | head -n1)"
+  fi
   cat "$tempfile"
   rm "$tempfile"
 }
@@ -64,3 +67,33 @@ wait_until_ready()
     exit 1
   fi
 }
+
+start_server()
+{
+  local server port path
+  server="$1"
+  port="$2"
+  path="$3"
+  if [ -n "$AUTOPKGTEST_TMP" ]; then
+    case "$server" in
+    jetty12)
+      # Workaround for https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1129201
+      # TODO: Remove me when the bug is fixed
+      sudo sed -i '/CATALINA/ s/^/#/' "/usr/libexec/jetty12/jetty-start.sh"
+      ;;
+    tomcat10)
+      sudo sed -i '/common.loader/ s#$#,/usr/share/tomcat-jakartaee-migration/lib/*.jar#' "/etc/tomcat10/catalina.properties"
+      ;;
+    tomcat11)
+      sudo sed -i '/common.loader/ s#$#,/usr/share/tomcat-jakartaee-migration/lib/*.jar#' "/etc/tomcat11/catalina.properties"
+      ;;
+    esac
+
+    sudo systemctl stop --job-mode=triggering "$server"
+    wait_until_not_state "$server" "active"
+    sudo systemctl start "$server"
+    wait_until_ready "$server" "$port" "$path"
+    sudo systemctl status "$server"
+  fi
+
+}


=====================================
debian/tests/webapp_validate_file.sh
=====================================
@@ -9,22 +9,7 @@ source "$(dirname "$0")"/webapp_validate_common.sh
 PORT=8080
 CONTEXT_PATH="css-validator/"
 
-if [ -n "$AUTOPKGTEST_TMP" ]; then
-  case "$server" in
-  tomcat10)
-    sudo sed -i '/common.loader/ s#$#,/usr/share/tomcat-jakartaee-migration/lib/*.jar#' "/etc/tomcat10/catalina.properties"
-    ;;
-  tomcat11)
-    sudo sed -i '/common.loader/ s#$#,/usr/share/tomcat-jakartaee-migration/lib/*.jar#' "/etc/tomcat11/catalina.properties"
-    ;;
-  esac
-
-  sudo systemctl stop --job-mode=triggering "$server"
-  wait_until_not_state "$server" "active"
-  sudo systemctl start "$server"
-  wait_until_ready "$server" "$PORT" "$CONTEXT_PATH"
-  sudo systemctl status "$server"
-fi
+start_server "$server" "${PORT:-8080}" "$CONTEXT_PATH"
 
 #echo "current path: $PWD"
 


=====================================
debian/tests/webapp_validate_url.sh
=====================================
@@ -9,22 +9,7 @@ source "$(dirname "$0")"/webapp_validate_common.sh
 PORT=8080
 CONTEXT_PATH="css-validator/"
 
-if [ -n "$AUTOPKGTEST_TMP" ]; then
-  case "$server" in
-  tomcat10)
-    sudo sed -i '/common.loader/ s#$#,/usr/share/tomcat-jakartaee-migration/lib/*.jar#' "/etc/tomcat10/catalina.properties"
-    ;;
-  tomcat11)
-    sudo sed -i '/common.loader/ s#$#,/usr/share/tomcat-jakartaee-migration/lib/*.jar#' "/etc/tomcat11/catalina.properties"
-    ;;
-  esac
-
-  sudo systemctl stop --job-mode=triggering "$server"
-  wait_until_not_state "$server" "active"
-  sudo systemctl start "$server"
-  wait_until_ready "$server" "$PORT" "$CONTEXT_PATH"
-  sudo systemctl status "$server"
-fi
+start_server "$server" "${PORT:-8080}" "$CONTEXT_PATH"
 
 #echo "current path: $PWD"
 



View it on GitLab: https://salsa.debian.org/java-team/css-validator/-/compare/2e6e892640297704292e9cae9a91b1fd47bcd9b4...0ff465412f6ab663c9465f78bf534b4bf13dd7bd

-- 
View it on GitLab: https://salsa.debian.org/java-team/css-validator/-/compare/2e6e892640297704292e9cae9a91b1fd47bcd9b4...0ff465412f6ab663c9465f78bf534b4bf13dd7bd
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20260304/fdf2d920/attachment.htm>