From 032e7af407f4e7402797f7ad5455b7c2fbba53e3 Mon Sep 17 00:00:00 2001
From: Ivan Pozdeev <vano@mail.mipt.ru>
Date: Tue, 25 Aug 2026 22:29:03 +0300
Subject: [PATCH] tests: consolidate shims tests

---
 test/shims-linked-from-elsewhere.bats | 39 ---------------------------
 test/shims.bats                       | 36 +++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 39 deletions(-)
 delete mode 100644 test/shims-linked-from-elsewhere.bats

diff --git a/test/shims-linked-from-elsewhere.bats b/test/shims-linked-from-elsewhere.bats
deleted file mode 100644
index b3e67b06..00000000
--- a/test/shims-linked-from-elsewhere.bats
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/usr/bin/env bats
-
-load test_helper
-
-@test "shims linked from elsewhere are chained, other programs at the same paths are unaffected (integration)" {
-  bats_require_minimum_version 1.5.0
-  progname=shimmed_program
-  called_progname=another_program
-  create_alt_executable_in_version "custom" "$progname" <<!
-echo "called from \$0"
-pyenv-exec "$called_progname"
-!
-  pyenv-rehash
-  PATH="$(path_without "$progname" "$called_progname")"
-  for disguised_shim_path in "$BATS_TEST_TMPDIR/"{weird-location,even/weirder/location}; do
-    mkdir -p "$disguised_shim_path"
-    ln -s "${PYENV_ROOT}/shims/$progname" "$disguised_shim_path/$progname"
-    PATH="$PATH:$disguised_shim_path"
-  done
-  create_executable "$disguised_shim_path" "$called_progname" <<!
-echo "convoluted call success!"
-!
-  real_path="$BATS_TEST_TMPDIR/real-location"
-  mkdir -p "$real_path"
-  ln -s "${PYENV_ROOT}/versions/custom/bin/$progname" "$real_path/$progname"
-  PATH="$PATH:$real_path"
-  
-  run "$progname"
-  assert_success
-  assert_output <<!
-called from $real_path/$progname
-convoluted call success!
-!
-
-  rm "$real_path/$progname"
-  run -127 "$progname"
-  assert_failure
-  assert_line 0 "pyenv: shimmed_program: command not found"
-}
diff --git a/test/shims.bats b/test/shims.bats
index 348125e4..21e452c6 100644
--- a/test/shims.bats
+++ b/test/shims.bats
@@ -27,3 +27,39 @@ load test_helper
   assert_line "irb"
   assert_line "python"
 }
+
+@test "shims linked from elsewhere are chained, other programs at the same paths are unaffected (integration)" {
+  bats_require_minimum_version 1.5.0
+  progname=shimmed_program
+  called_progname=another_program
+  create_alt_executable_in_version "custom" "$progname" <<!
+echo "called from \$0"
+pyenv-exec "$called_progname"
+!
+  pyenv-rehash
+  PATH="$(path_without "$progname" "$called_progname")"
+  for disguised_shim_path in "$BATS_TEST_TMPDIR/"{weird-location,even/weirder/location}; do
+    mkdir -p "$disguised_shim_path"
+    ln -s "${PYENV_ROOT}/shims/$progname" "$disguised_shim_path/$progname"
+    PATH="$PATH:$disguised_shim_path"
+  done
+  create_executable "$disguised_shim_path" "$called_progname" <<!
+echo "convoluted call success!"
+!
+  real_path="$BATS_TEST_TMPDIR/real-location"
+  mkdir -p "$real_path"
+  ln -s "${PYENV_ROOT}/versions/custom/bin/$progname" "$real_path/$progname"
+  PATH="$PATH:$real_path"
+  
+  run "$progname"
+  assert_success
+  assert_output <<!
+called from $real_path/$progname
+convoluted call success!
+!
+
+  rm "$real_path/$progname"
+  run -127 "$progname"
+  assert_failure
+  assert_line 0 "pyenv: shimmed_program: command not found"
+}