Isolation of end-to-end tests

.github/workflows/test.yml

@@ -32,7 +32,7 @@ jobs:
           components: rustfmt
       - uses: taiki-e/install-action@v2
         with:
-          tool: nextest,just,cargo-deny,cargo-msrv,cargo-machete,usage-cli
+          tool: nextest,cargo-deny,cargo-msrv,cargo-machete,usage-cli
       - name: Install direnv
         run: sudo apt-get update; sudo apt-get install direnv
       - run: cargo nextest run --all-features
@@ -81,7 +81,17 @@ jobs:
         with:
           shared-key: coverage
           save-if: ${{ github.ref_name == 'main' }}
-      - run: sudo apt-get update; sudo apt-get install zsh fish direnv
+      - name: Install build and test dependencies
+        run: |
+          sudo apt-get update && sudo apt-get install \
+            bison \
+            build-essential \
+            direnv \
+            fd-find \
+            fish \
+            pipx \
+            python3-venv \
+            zsh
       - uses: taiki-e/install-action@v2
         with:
           tool: cargo-llvm-cov,mise,usage-cli
@@ -104,4 +114,4 @@ jobs:
         continue-on-error: true
         with:
           project-token: cb3da7e860bf4e31a50e733aefa8d347
-          coverage-reports: lcov.info
+          coverage-reports: lcov0.info,lcov1.info,lcov2.info,lcov3.info

.mise.toml

@@ -92,12 +92,16 @@ depends = ["build"]
 
 [tasks."docker:image"]
 description = "build docker image from Dockerfile"
-run = 'docker build $root -f $root/packaging/dev/Dockerfile -t ghcr.io/jdx/mise:dev'
+run = 'docker build --build-arg GITHUB_TOKEN=$GITHUB_API_TOKEN $root -f $root/packaging/dev/Dockerfile -t ghcr.io/jdx/mise:dev'
+
+[tasks."docker:run"]
+description = "run a command inside of development docker container"
+run = 'docker run -ti --rm -e GITHUB_API_TOKEN -e TEST_ALL -v $root:/mise -v /tmp/mise/target:/tmp/mise/target -v /tmp/mise/registry:/tmp/mise/registry -w /mise ghcr.io/jdx/mise:dev'
+depends = ["docker:image"]
 
 [tasks."docker:cargo"]
 description = "run cargo inside of development docker container"
-run = 'docker run -ti --rm -e GITHUB_API_TOKEN -v $root:/mise -v /tmp/mise/target:/tmp/mise/target -v /tmp/mise/registry:/tmp/mise/registry -w /mise ghcr.io/jdx/mise:dev cargo'
-depends = ["docker:image"]
+run = 'mise tasks run docker:run cargo'
 
 [tasks."docker:mise"]
 description = "run mise inside of development docker container"

.mise/tasks/test/coverage

@@ -34,4 +34,4 @@ elif [[ "${TEST_TRANCHE:-}" == 1 ]]; then
   mise self-update -fy "$y.$m.0"
 fi
 echo "::group::Render lcov report"
-cargo llvm-cov report --lcov --output-path lcov.info
+cargo llvm-cov report --lcov --output-path "lcov${TEST_TRANCHE:-}.info"

.mise/tasks/test/e2e

@@ -9,7 +9,11 @@ export RUST_TEST_THREADS=1
 if [[ "${1:-all}" == all ]]; then
   ./e2e/run_all_tests
 else
-  FILES="$(fd "$1" e2e/)"
+  FILES="$(find e2e -name "test_*$1*" -type f -printf "%P\n")"
+  if [[ -z $FILES ]]; then
+    echo "Not test matches $1" >&2
+    exit 1
+  fi
   for FILE in $FILES; do
     ./e2e/run_test "$FILE"
   done

Cargo.toml

@@ -42,7 +42,10 @@ lto = true
 [dependencies]
 base64 = "0.22.1"
 calm_io = "0.1.1"
-chrono = { version = "0.4.38", default-features = false, features = ["std", "clock"] }
+chrono = { version = "0.4.38", default-features = false, features = [
+  "std",
+  "clock",
+] }
 ci_info = "0.14.14"
 clap = { version = "4.5.4", features = ["env", "derive", "string"] }
 clap_mangen = { version = "0.2.20", optional = true }
@@ -77,7 +80,11 @@ petgraph = "0.6.4"
 rand = "0.8.5"
 rayon = "1.10.0"
 regex = "1.10.4"
-reqwest = { version = "<0.12", default-features = false, features = ["blocking", "json", "gzip"] }
+reqwest = { version = "<0.12", default-features = false, features = [
+  "blocking",
+  "json",
+  "gzip",
+] }
 rmp-serde = "1.3.0"
 # TODO: fix issue with rustls and "No signature verification implemented for Plain(None) files"
 self_update = { version = "<0.40.0", default-features = false, features = [

e2e/assert.sh

@@ -1,44 +1,91 @@
-#!/usr/bin/env bash
+# shellcheck shell=bash
+
+# shellcheck source-path=SCRIPTDIR
+source "$TEST_ROOT/style.sh"
+
+fail() {
+  title="E2E assertion failed" err "$*"
+  exit 1
+}
+
+# Safeguard against running the test directly, which would execute in the actual user home
+[[ -n "${TEST_NAME:-}" ]] || fail "tests should be called using run_test"
+
+quiet_assert_succeed() {
+  local status=0
+  bash -c "$1" || status=$?
+  if [[ $status -ne 0 ]]; then
+    fail "[$1] command failed with status $status"
+  fi
+}
+
+assert_succeed() {
+  if quiet_assert_succeed "$1"; then
+    ok "[$1] expected success"
+  fi
+}
+
+assert_fail() {
+  if ! bash -c "$1" 2>&1; then
+    ok "[$1] expected failure"
+  else
+    fail "[$1] expected failure but succeeded"
+  fi
+}
 
 assert() {
   local actual
-  actual="$(bash -c "$1")"
-  if [[ "$actual" != "$2" ]]; then
-    echo "Expected '$2' but got '$actual'"
-    exit 1
+  actual="$(quiet_assert_succeed "$1")"
+  if [[ $actual == "$2" ]]; then
+    ok "[$1] output is equal to '$2'"
+  else
+    fail "[$1] expected '$2' but got '$actual'"
   fi
 }
 
-assert_contains() {
+assert_not() {
   local actual
-  actual="$(bash -c "$1")"
-  if [[ "$actual" != *"$2"* ]]; then
-    echo "Expected '$2' to be in '$actual'"
-    exit 1
+  actual="$(bash -c "$1" || true)"
+  if [[ $actual != "$2" ]]; then
+    ok "[$1] output is different from '$2'"
+  else
+    fail "[$1] expected '$2' not to be in '$actual'"
   fi
 }
 
-assert_not_contains() {
+assert_contains() {
   local actual
-  actual="$(bash -c "$1")"
-  if [[ "$actual" == *"$2"* ]]; then
-    echo "Expected '$2' to not be in '$actual'"
-    exit 1
+  actual="$(quiet_assert_succeed "$1")"
+  if [[ $actual == *"$2"* ]]; then
+    ok "[$1] '$2' is in output"
+  else
+    fail "[$1] expected '$2' to be in '$actual'"
   fi
 }
 
-assert_fail() {
-  if bash -c "$1" 2>&1; then
-    echo "Expected failure but succeeded"
-    exit 1
+assert_not_contains() {
+  local actual
+  actual="$(quiet_assert_succeed "$1")"
+  if [[ $actual != *"$2"* ]]; then
+    ok "[$1] '$2' is not in output"
+  else
+    fail "[$1] expected '$2' not to be in '$actual'"
   fi
 }
 
 assert_matches() {
   local actual
-  actual="$(bash -c "$1")"
-  if [[ ! "$actual" =~ $2 ]]; then
-    echo "Expected '$2' to match '$actual'"
-    exit 1
+  actual="$(quiet_assert_succeed "$1")"
+  if [[ $actual =~ $2 ]]; then
+    ok "[$1] '$2' matches output"
+  else
+    fail "[$1] expected '$2' to match '$actual'"
+  fi
+}
+
+require_cmd() {
+  if ! type -p "$1" >/dev/null; then
+    title="E2E test $TEST_NAME aborted" err "'$1' is required but was not found in PATH"
+    exit 2
   fi
 }

e2e/cli/test_activate_path_safety

@@ -0,0 +1,5 @@
+# shellcheck shell=bash
+
+eval "$(mise activate bash)" && eval "$(mise hook-env)"
+install -m 0755 /dev/null "$TMPDIR/MISE_PATH_SAFETY_CHECK"
+assert_fail "cd '$TMPDIR' && command -v MISE_PATH_SAFETY_CHECK"

e2e/cli/test_doctor

@@ -0,0 +1,6 @@
+# shellcheck shell=bash
+
+mise use dummy@latest
+
+eval "$(mise activate bash)" && _mise_hook
+mise doctor

e2e/cli/test_env_file

@@ -0,0 +1,12 @@
+# shellcheck shell=bash
+
+cat <<'EOF' >.mise.toml
+[env]
+mise.file = ['.test-env']
+EOF
+
+echo FOO_FROM_FILE=foo_from_file >.test-env
+echo TEST_ENV2=foo >.test-env2
+
+assert "mise x -- env | grep FOO_FROM_FILE" "FOO_FROM_FILE=foo_from_file"
+assert "MISE_ENV_FILE=.test-env2 mise x -- env | grep TEST_ENV2" "TEST_ENV2=foo"

e2e/test_env_file_glob → e2e/cli/test_env_file_glob

@@ -1,9 +1,6 @@
-#!/usr/bin/env bash
-set -euo pipefail
-# shellcheck source-path=SCRIPTDIR
-source "$(dirname "$0")/assert.sh"
+# shellcheck shell=bash
 
-cat >.e2e.mise.toml <<EOF
+cat <<'EOF' >.mise.toml
 [env]
 _.file = "env.d/*.env"
 EOF

e2e/cli/test_env_json

@@ -0,0 +1,9 @@
+# shellcheck shell=bash
+require_cmd jq
+
+cat >.mise.toml <<EOF
+[env]
+FOO = "bar"
+EOF
+
+assert "mise env --json dummy@latest | jq -r .FOO" "bar"