Revert "Debug output for failing tests"

namedgraph · namedgraph · commit ffadf132c402 · 2026-01-03T14:50:42.000+01:00
This reverts commit 9384e34.
diff --git a/http-tests/admin/packages/install-uninstall-package-ontology.sh b/http-tests/admin/packages/install-uninstall-package-ontology.sh
@@ -13,53 +13,41 @@ package_ontology_uri="https://raw.githubusercontent.com/AtomGraph/LinkedDataHub-
 namespace_ontology_uri="${END_USER_BASE_URL}ns#"
 
 # install package
-echo "DEBUG: Installing package..." >&2
-install_status=$(curl -k -w "%{http_code}\n" -o /dev/null -s \
+curl -k -w "%{http_code}\n" -o /dev/null -f -s \
   -E "$OWNER_CERT_FILE":"$OWNER_CERT_PWD" \
   -X POST \
   -H "Content-Type: application/x-www-form-urlencoded" \
   --data-urlencode "package-uri=$package_uri" \
-  "$ADMIN_BASE_URL"packages/install)
-echo "DEBUG: Install status: $install_status" >&2
-echo "$install_status" | grep -q "$STATUS_SEE_OTHER"
+  "$ADMIN_BASE_URL"packages/install \
+| grep -q "$STATUS_SEE_OTHER"
 
 # verify owl:imports triple was added
-echo "DEBUG: Verifying owl:imports was added..." >&2
-ns_after_install=$(curl -k -s -H "Accept: application/n-triples" "${END_USER_BASE_URL}ns")
-echo "DEBUG: Namespace after install:" >&2
-echo "$ns_after_install" | grep "owl#imports" >&2
-echo "$ns_after_install" | grep -q "<${namespace_ontology_uri}> <http://www.w3.org/2002/07/owl#imports> <${package_ontology_uri}>"
+curl -k -s \
+  -H "Accept: application/n-triples" \
+  "${END_USER_BASE_URL}ns" \
+| grep -q "<${namespace_ontology_uri}> <http://www.w3.org/2002/07/owl#imports> <${package_ontology_uri}>"
 
 # verify package ontology document exists
-echo "DEBUG: Verifying package ontology document exists..." >&2
 package_ontology_hash=$(echo -n "$package_ontology_uri" | shasum -a 1 | cut -d' ' -f1)
-ontology_doc_status=$(curl -k -w "%{http_code}\n" -o /dev/null -s "${ADMIN_BASE_URL}ontologies/${package_ontology_hash}/")
-echo "DEBUG: Ontology document status: $ontology_doc_status" >&2
-echo "$ontology_doc_status" | grep -q "200"
+curl -k -f -s -o /dev/null \
+  "${ADMIN_BASE_URL}ontologies/${package_ontology_hash}/"
 
 # uninstall package
-echo "DEBUG: Uninstalling package..." >&2
-uninstall_status=$(curl -k -w "%{http_code}\n" -o /dev/null -s \
+curl -k -w "%{http_code}\n" -o /dev/null -f -s \
   -E "$OWNER_CERT_FILE":"$OWNER_CERT_PWD" \
   -X POST \
   -H "Content-Type: application/x-www-form-urlencoded" \
   --data-urlencode "package-uri=$package_uri" \
-  "$ADMIN_BASE_URL"packages/uninstall)
-echo "DEBUG: Uninstall status: $uninstall_status" >&2
-echo "$uninstall_status" | grep -q "$STATUS_SEE_OTHER"
+  "$ADMIN_BASE_URL"packages/uninstall \
+| grep -q "$STATUS_SEE_OTHER"
 
 # verify owl:imports triple was removed
-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 (expected)" >&2
 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
 fi
 
 # verify package ontology document was deleted
-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
-echo "$deleted_status" | grep -q "$STATUS_FORBIDDEN"
+curl -k -w "%{http_code}\n" -o /dev/null -s \
+  "${ADMIN_BASE_URL}ontologies/${package_ontology_hash}/" \
+| grep -q "$STATUS_FORBIDDEN"
diff --git a/http-tests/admin/packages/install-uninstall-package-stylesheet.sh b/http-tests/admin/packages/install-uninstall-package-stylesheet.sh
@@ -11,56 +11,38 @@ purge_cache "$FRONTEND_VARNISH_SERVICE"
 package_uri="https://packages.linkeddatahub.com/skos/#this"
 
 # install package
-echo "DEBUG: Installing package..." >&2
-install_status=$(curl -k -w "%{http_code}\n" -o /dev/null -s \
+curl -k -w "%{http_code}\n" -o /dev/null -f -s \
   -E "$OWNER_CERT_FILE":"$OWNER_CERT_PWD" \
   -X POST \
   -H "Content-Type: application/x-www-form-urlencoded" \
   --data-urlencode "package-uri=$package_uri" \
-  "$ADMIN_BASE_URL"packages/install)
-echo "DEBUG: Install status: $install_status" >&2
-echo "$install_status" | grep -q "$STATUS_SEE_OTHER"
+  "$ADMIN_BASE_URL"packages/install \
+| grep -q "$STATUS_SEE_OTHER"
 
 # verify package stylesheet was installed (should return 200)
-echo "DEBUG: Verifying package stylesheet was installed..." >&2
-package_xsl_status=$(curl -k -w "%{http_code}\n" -o /dev/null -s "${END_USER_BASE_URL}static/com/linkeddatahub/packages/skos/layout.xsl")
-echo "DEBUG: Package stylesheet status: $package_xsl_status" >&2
-echo "$package_xsl_status" | grep -q "200"
+curl -k -f -s -o /dev/null \
+  "${END_USER_BASE_URL}static/com/linkeddatahub/packages/skos/layout.xsl"
 
 # verify master stylesheet includes package
-echo "DEBUG: Verifying master stylesheet includes package..." >&2
-master_xsl_before=$(curl -k -s "$END_USER_BASE_URL"static/xsl/layout.xsl)
-if echo "$master_xsl_before" | grep -q "com/linkeddatahub/packages/skos/layout.xsl"; then
-  echo "DEBUG: Master stylesheet includes package (expected)" >&2
-else
-  echo "ERROR: Master stylesheet does not include package after install!" >&2
-  exit 1
-fi
+curl -k -s "$END_USER_BASE_URL"static/xsl/layout.xsl \
+  | grep -q "com/linkeddatahub/packages/skos/layout.xsl"
 
 # uninstall package
-echo "DEBUG: Uninstalling package..." >&2
-uninstall_status=$(curl -k -w "%{http_code}\n" -o /dev/null -s \
+curl -k -w "%{http_code}\n" -o /dev/null -f -s \
   -E "$OWNER_CERT_FILE":"$OWNER_CERT_PWD" \
   -X POST \
   -H "Content-Type: application/x-www-form-urlencoded" \
   --data-urlencode "package-uri=$package_uri" \
-  "$ADMIN_BASE_URL"packages/uninstall)
-echo "DEBUG: Uninstall status: $uninstall_status" >&2
-echo "$uninstall_status" | grep -q "$STATUS_SEE_OTHER"
+  "$ADMIN_BASE_URL"packages/uninstall \
+| grep -q "$STATUS_SEE_OTHER"
 
 # verify package stylesheet was deleted (should return 404)
-echo "DEBUG: Verifying package stylesheet was deleted..." >&2
-deleted_xsl_status=$(curl -k -w "%{http_code}\n" -o /dev/null -s "${END_USER_BASE_URL}static/com/linkeddatahub/packages/skos/layout.xsl")
-echo "DEBUG: Deleted package stylesheet status: $deleted_xsl_status" >&2
-echo "$deleted_xsl_status" | grep -q "$STATUS_NOT_FOUND"
+curl -k -w "%{http_code}\n" -o /dev/null -s \
+  "${END_USER_BASE_URL}static/com/linkeddatahub/packages/skos/layout.xsl" \
+| grep -q "$STATUS_NOT_FOUND"
 
 # verify master stylesheet no longer includes package
-echo "DEBUG: Verifying master stylesheet no longer includes package..." >&2
 master_xsl=$(curl -k -s "$END_USER_BASE_URL"static/xsl/layout.xsl)
 if echo "$master_xsl" | grep -q "com/linkeddatahub/packages/skos/layout.xsl"; then
-  echo "ERROR: Master stylesheet still includes package after uninstall!" >&2
-  echo "DEBUG: Master stylesheet content:" >&2
-  echo "$master_xsl" | grep -C 2 "com/linkeddatahub/packages/skos/layout.xsl" >&2
   exit 1
 fi
-echo "DEBUG: Master stylesheet does not include package (expected)" >&2
diff --git a/http-tests/admin/packages/uninstall-package-stylesheet.sh b/http-tests/admin/packages/uninstall-package-stylesheet.sh
@@ -11,46 +11,34 @@ purge_cache "$FRONTEND_VARNISH_SERVICE"
 package_uri="https://packages.linkeddatahub.com/skos/#this"
 
 # first install the package
-echo "DEBUG: Installing package first..." >&2
-install_status=$(curl -k -w "%{http_code}\n" -o /dev/null -s \
+curl -k -w "%{http_code}\n" -o /dev/null -f -s \
   -E "$OWNER_CERT_FILE":"$OWNER_CERT_PWD" \
   -X POST \
   -H "Content-Type: application/x-www-form-urlencoded" \
   --data-urlencode "package-uri=$package_uri" \
-  "${ADMIN_BASE_URL}packages/install")
-echo "DEBUG: Install status: $install_status" >&2
-echo "$install_status" | grep -q "$STATUS_SEE_OTHER"
+  "${ADMIN_BASE_URL}packages/install" \
+| grep -q "$STATUS_SEE_OTHER"
 
 # verify package stylesheet exists before uninstall (should return 200)
-echo "DEBUG: Verifying package stylesheet exists before uninstall..." >&2
-before_status=$(curl -k -w "%{http_code}\n" -o /dev/null -s "${END_USER_BASE_URL}static/com/linkeddatahub/packages/skos/layout.xsl")
-echo "DEBUG: Package stylesheet status before uninstall: $before_status" >&2
-echo "$before_status" | grep -q "200"
+curl -k -f -s -o /dev/null \
+  "${END_USER_BASE_URL}static/com/linkeddatahub/packages/skos/layout.xsl"
 
 # uninstall package via POST to packages/uninstall endpoint
-echo "DEBUG: Uninstalling package..." >&2
-uninstall_status=$(curl -k -w "%{http_code}\n" -o /dev/null -s \
+curl -k -w "%{http_code}\n" -o /dev/null -f -s \
   -E "$OWNER_CERT_FILE":"$OWNER_CERT_PWD" \
   -X POST \
   -H "Content-Type: application/x-www-form-urlencoded" \
   --data-urlencode "package-uri=$package_uri" \
-  "${ADMIN_BASE_URL}packages/uninstall")
-echo "DEBUG: Uninstall status: $uninstall_status" >&2
-echo "$uninstall_status" | grep -q "$STATUS_SEE_OTHER"
+  "${ADMIN_BASE_URL}packages/uninstall" \
+| grep -q "$STATUS_SEE_OTHER"
 
 # verify package stylesheet was deleted (should return 404)
-echo "DEBUG: Verifying package stylesheet was deleted..." >&2
-deleted_status=$(curl -k -w "%{http_code}\n" -o /dev/null -s "${END_USER_BASE_URL}static/com/linkeddatahub/packages/skos/layout.xsl")
-echo "DEBUG: Deleted package stylesheet status: $deleted_status" >&2
-echo "$deleted_status" | grep -q "$STATUS_NOT_FOUND"
+curl -k -w "%{http_code}\n" -o /dev/null -s \
+  "${END_USER_BASE_URL}static/com/linkeddatahub/packages/skos/layout.xsl" \
+| grep -q "$STATUS_NOT_FOUND"
 
 # 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)
 if echo "$master_xsl" | grep -q "com/linkeddatahub/packages/skos/layout.xsl"; then
-  echo "ERROR: Master stylesheet still includes package after uninstall!" >&2
-  echo "DEBUG: Master stylesheet content:" >&2
-  echo "$master_xsl" | grep -C 2 "com/linkeddatahub/packages/skos/layout.xsl" >&2
   exit 1
 fi
-echo "DEBUG: Master stylesheet does not include package (expected)" >&2
diff --git a/http-tests/run.sh b/http-tests/run.sh
@@ -45,14 +45,14 @@ function run_tests()
         echo -n "$script_pathname";
         script_filename=$(basename "$script_pathname")
         script_directory=$(dirname "$script_pathname")
-        local output=$(cd "$script_directory" || exit; bash -e "$script_filename" 2>&1)
-        local exit_code=$?
-        if [[ $exit_code == "0" ]]
+        ( cd "$script_directory" || exit;
+            bash -e "$script_filename";
+        )
+        if [[ $? == "0" ]]
         then
             echo "   ok"
         else
             echo "   failed";
-            echo "$output"
             (( error_count += 1))
         fi
     done
@@ -138,24 +138,24 @@ download_dataset "$ADMIN_ENDPOINT_URL" > "$TMP_ADMIN_DATASET"
 
 ### Other tests ###
 
-#run_tests $(find ./add/ -type f -name '*.sh')
-#(( error_count += $? ))
-run_tests $(find ./admin/packages -type f -name '*.sh')
+run_tests $(find ./add/ -type f -name '*.sh')
+(( error_count += $? ))
+run_tests $(find ./admin/ -type f -name '*.sh')
+(( error_count += $? ))
+run_tests $(find ./dataspaces/ -type f -name '*.sh')
+(( error_count += $? ))
+run_tests $(find ./access/ -type f -name '*.sh')
+(( error_count += $? ))
+run_tests $(find ./imports/ -type f -name '*.sh')
+(( error_count += $? ))
+run_tests $(find ./document-hierarchy/ -type f -name '*.sh')
+(( error_count += $? ))
+run_tests $(find ./misc/ -type f -name '*.sh')
+(( error_count += $? ))
+run_tests $(find ./proxy/ -type f -name '*.sh')
+(( error_count += $? ))
+run_tests $(find ./sparql-protocol/ -type f -name '*.sh')
 (( error_count += $? ))
-#run_tests $(find ./dataspaces/ -type f -name '*.sh')
-#(( error_count += $? ))
-#run_tests $(find ./access/ -type f -name '*.sh')
-#(( error_count += $? ))
-#run_tests $(find ./imports/ -type f -name '*.sh')
-#(( error_count += $? ))
-#run_tests $(find ./document-hierarchy/ -type f -name '*.sh')
-#(( error_count += $? ))
-#run_tests $(find ./misc/ -type f -name '*.sh')
-#(( error_count += $? ))
-#run_tests $(find ./proxy/ -type f -name '*.sh')
-#(( error_count += $? ))
-#run_tests $(find ./sparql-protocol/ -type f -name '*.sh')
-#(( error_count += $? ))
 
 end_time=$(date +%s)
 runtime=$((end_time-start_time))
