Cleanup e2e tests (#23)

Signed-off-by: Juan Cruz Viotti <[email protected]>
sourcemeta · Jun 1, 2024 · 980db51 · 980db51
1 parent dec45be
commit 980db51
Show file tree

Hide file tree

Showing 9 changed files with 2 additions and 33 deletions.
diff --git a/test/format_cwd.sh b/test/format_cwd.sh
@@ -40,22 +40,5 @@ cat << 'EOF' > "$TMP/expected_2.json"
 }
 EOF
 
-if ! cmp -s "$TMP/schema_1.json" "$TMP/expected_1.json"
-then
-  echo "GOT:" 1>&2
-  cat "$TMP/schema_1.json" 1>&2
-  echo "EXPECTED:" 1>&2
-  cat "$TMP/expected_1.json" 1>&2
-  echo "FAIL" 1>&2
-  exit 1
-fi
-
-if ! cmp -s "$TMP/schema_2.json" "$TMP/expected_2.json"
-then
-  echo "GOT:" 1>&2
-  cat "$TMP/schema_2.json" 1>&2
-  echo "EXPECTED:" 1>&2
-  cat "$TMP/expected_2.json" 1>&2
-  echo "FAIL" 1>&2
-  exit 1
-fi
+diff "$TMP/schema_1.json" "$TMP/expected_1.json"
+diff "$TMP/schema_2.json" "$TMP/expected_2.json"
diff --git a/test/format_invalid_path.sh b/test/format_invalid_path.sh
@@ -4,7 +4,6 @@ set -o errexit
 set -o nounset
 
 TMP="$(mktemp -d)"
-# shellcheck disable=SC2317
 clean() { rm -rf "$TMP"; }
 trap clean EXIT
 
@@ -16,5 +15,4 @@ then
   exit 1
 else
   echo "PASS" 1>&2
-  exit 0
 fi
diff --git a/test/lint_fail.sh b/test/lint_fail.sh
@@ -4,7 +4,6 @@ set -o errexit
 set -o nounset
 
 TMP="$(mktemp -d)"
-# shellcheck disable=SC2317
 clean() { rm -rf "$TMP"; }
 trap clean EXIT
 
@@ -24,5 +23,4 @@ then
   exit 1
 else
   echo "PASS" 1>&2
-  exit 0
 fi
diff --git a/test/lint_fix.sh b/test/lint_fix.sh
@@ -4,7 +4,6 @@ set -o errexit
 set -o nounset
 
 TMP="$(mktemp -d)"
-# shellcheck disable=SC2317
 clean() { rm -rf "$TMP"; }
 trap clean EXIT
 

diff --git a/test/lint_pass.sh b/test/lint_pass.sh
@@ -4,7 +4,6 @@ set -o errexit
 set -o nounset
 
 TMP="$(mktemp -d)"
-# shellcheck disable=SC2317
 clean() { rm -rf "$TMP"; }
 trap clean EXIT
 

diff --git a/test/test_single_fail.sh b/test/test_single_fail.sh
@@ -4,7 +4,6 @@ set -o errexit
 set -o nounset
 
 TMP="$(mktemp -d)"
-# shellcheck disable=SC2317
 clean() { rm -rf "$TMP"; }
 trap clean EXIT
 
@@ -35,5 +34,4 @@ then
   exit 1
 else
   echo "PASS" 1>&2
-  exit 0
 fi
diff --git a/test/test_single_unsupported.sh b/test/test_single_unsupported.sh
@@ -4,7 +4,6 @@ set -o errexit
 set -o nounset
 
 TMP="$(mktemp -d)"
-# shellcheck disable=SC2317
 clean() { rm -rf "$TMP"; }
 trap clean EXIT
 
@@ -35,5 +34,4 @@ then
   exit 1
 else
   echo "PASS" 1>&2
-  exit 0
 fi
diff --git a/test/validate_fail.sh b/test/validate_fail.sh
@@ -4,7 +4,6 @@ set -o errexit
 set -o nounset
 
 TMP="$(mktemp -d)"
-# shellcheck disable=SC2317
 clean() { rm -rf "$TMP"; }
 trap clean EXIT
 
@@ -32,5 +31,4 @@ then
   exit 1
 else
   echo "PASS" 1>&2
-  exit 0
 fi
diff --git a/test/validate_non_supported.sh b/test/validate_non_supported.sh
@@ -4,7 +4,6 @@ set -o errexit
 set -o nounset
 
 TMP="$(mktemp -d)"
-# shellcheck disable=SC2317
 clean() { rm -rf "$TMP"; }
 trap clean EXIT
 
@@ -32,5 +31,4 @@ then
   exit 1
 else
   echo "PASS" 1>&2
-  exit 0
 fi