test-datasette-load-plugins now fails correctly, refs #2193

simonw · Sep 21, 2023 · 80a9cd9 · 80a9cd9
1 parent b0d0a0e
commit 80a9cd9
Showing 1 changed file with 19 additions and 22 deletions.
diff --git a/tests/test-datasette-load-plugins.sh b/tests/test-datasette-load-plugins.sh
@@ -3,27 +3,24 @@
 # datasette-init and datasette-json-html are installed
 
 PLUGINS=$(datasette plugins)
-echo "$PLUGINS" | jq 'any(.[]; .name == "datasette-json-html")' | \
-  grep -q true || ( \
-    echo "Test failed: datasette-json-html not found" && \
-    exit 1 \
-  )
-# With the DATASETTE_LOAD_PLUGINS we should not see that
+if ! echo "$PLUGINS" | jq 'any(.[]; .name == "datasette-json-html")' | grep -q true; then
+  echo "Test failed: datasette-json-html not found"
+  exit 1
+fi
+
 PLUGINS2=$(DATASETTE_LOAD_PLUGINS=datasette-init datasette plugins)
-echo "$PLUGINS2" | jq 'any(.[]; .name == "datasette-json-html")' | \
-  grep -q false || ( \
-    echo "Test failed: datasette-json-html should not have been loaded" && \
-    exit 1 \
-  )
-echo "$PLUGINS2" | jq 'any(.[]; .name == "datasette-init")' | \
-  grep -q true || ( \
-    echo "Test failed: datasette-init should have been loaded" && \
-    exit 1 \
-  )
-# With DATASETTE_LOAD_PLUGINS='' we should see no plugins
+if ! echo "$PLUGINS2" | jq 'any(.[]; .name == "datasette-json-html")' | grep -q false; then
+  echo "Test failed: datasette-json-html should not have been loaded"
+  exit 1
+fi
+
+if ! echo "$PLUGINS2" | jq 'any(.[]; .name == "datasette-init")' | grep -q true; then
+  echo "Test failed: datasette-init should have been loaded"
+  exit 1
+fi
+
 PLUGINS3=$(DATASETTE_LOAD_PLUGINS='' datasette plugins)
-echo "$PLUGINS3"| \
-  grep -q '\[\]' || ( \
-    echo "Test failed: datasette plugins should have returned []" && \
-    exit 1 \
-  )
+if ! echo "$PLUGINS3" | grep -q '\[\]'; then
+  echo "Test failed: datasette plugins should have returned []"
+  exit 1
+fi