Debug changes

Author: namedgraph

http-tests/admin/packages/install-uninstall-package-ontology.sh

@@ -54,10 +54,14 @@ echo "$uninstall_status" | grep -q "$STATUS_SEE_OTHER"
 echo "DEBUG: Verifying owl:imports was removed..." >&2
 ns_after=$(curl -k -s -H "Accept: application/n-triples" "${END_USER_BASE_URL}ns")
 echo "DEBUG: Namespace after uninstall:" >&2
-echo "$ns_after" | grep "owl#imports" >&2 || echo "DEBUG: No owl:imports found" >&2
+if echo "$ns_after" | grep "owl#imports" >&2; then
+  echo "DEBUG: Found owl:imports in namespace" >&2
+else
+  echo "DEBUG: No owl:imports found" >&2
+fi
 if echo "$ns_after" | grep -q "<${namespace_ontology_uri}> <http://www.w3.org/2002/07/owl#imports> <${package_ontology_uri}>"; then
   echo "ERROR: Package ontology import still present after uninstall!" >&2
-  exit 1
+  false
 fi
 echo "DEBUG: owl:imports triple was removed" >&2
 
@@ -66,7 +70,7 @@ echo "DEBUG: Verifying package ontology document was deleted..." >&2
 deleted_status=$(curl -k -w "%{http_code}\n" -o /dev/null -s \
   "${ADMIN_BASE_URL}ontologies/${package_ontology_hash}/")
 echo "DEBUG: Deleted ontology document status: $deleted_status" >&2
-if ! echo "$deleted_status" | grep -q "$STATUS_FORBIDDEN"; then
+echo "$deleted_status" | grep -q "$STATUS_FORBIDDEN" || {
   echo "ERROR: Expected 403 but got $deleted_status" >&2
-  exit 1
-fi
+  false
+}

http-tests/admin/packages/install-uninstall-package-stylesheet.sh

@@ -62,11 +62,12 @@ backend_status=$(curl -k -w "%{http_code}\n" -o /dev/null -s \
   "${END_USER_BASE_URL}static/com/linkeddatahub/packages/skos/layout.xsl")
 echo "DEBUG: Backend status: $backend_status" >&2
 
-if ! echo "$deleted_status" | grep -q "$STATUS_NOT_FOUND"; then
+# Check if stylesheet was deleted (should return 404)
+echo "$deleted_status" | grep -q "$STATUS_NOT_FOUND" || {
   echo "ERROR: Expected 404 but got $deleted_status from Varnish" >&2
   echo "ERROR: Backend returned $backend_status" >&2
-  exit 1
-fi
+  false  # Use false instead of exit 1 to ensure it fails with set -e
+}
 
 # verify master stylesheet no longer includes package
 echo "DEBUG: Verifying master stylesheet no longer includes package..." >&2
@@ -79,6 +80,6 @@ else
 fi
 if echo "$master_xsl" | grep -q "com/linkeddatahub/packages/skos/layout.xsl"; then
   echo "ERROR: Master stylesheet still includes package after uninstall!" >&2
-  exit 1
+  false
 fi
 echo "DEBUG: Master stylesheet verification passed" >&2

http-tests/admin/packages/uninstall-package-stylesheet.sh

@@ -55,19 +55,24 @@ backend_status=$(curl -k -w "%{http_code}\n" -o /dev/null -s \
   "${END_USER_BASE_URL}static/com/linkeddatahub/packages/skos/layout.xsl")
 echo "DEBUG: Backend status: $backend_status" >&2
 
-if ! echo "$deleted_status" | grep -q "$STATUS_NOT_FOUND"; then
+# Check if stylesheet was deleted (should return 404)
+echo "$deleted_status" | grep -q "$STATUS_NOT_FOUND" || {
   echo "ERROR: Expected 404 but got $deleted_status from Varnish" >&2
   echo "ERROR: Backend returned $backend_status" >&2
-  exit 1
-fi
+  false  # Use false instead of exit 1 to ensure it fails with set -e
+}
 
 # verify master stylesheet was regenerated without package import
 echo "DEBUG: Verifying master stylesheet no longer includes package..." >&2
 master_xsl=$(curl -k -s "$END_USER_BASE_URL"static/xsl/layout.xsl)
 echo "DEBUG: Master stylesheet content (checking for package):" >&2
-echo "$master_xsl" | grep "com/linkeddatahub/packages" >&2 || echo "DEBUG: No package imports found" >&2
+if echo "$master_xsl" | grep "com/linkeddatahub/packages" >&2; then
+  echo "DEBUG: Found package imports in master stylesheet" >&2
+else
+  echo "DEBUG: No package imports found" >&2
+fi
 if echo "$master_xsl" | grep -q "com/linkeddatahub/packages/skos/layout.xsl"; then
   echo "ERROR: Master stylesheet still includes package after uninstall!" >&2
-  exit 1
+  false
 fi
 echo "DEBUG: Master stylesheet verification passed" >&2