Add test that path is preserved

Hofer-Julian · Hofer-Julian · commit ea17769d9472 · 2024-11-22T17:24:37.000+01:00
diff --git a/crates/pixi_trampoline/trampolines/pixi-trampoline-x86_64-unknown-linux-musl.zst b/crates/pixi_trampoline/trampolines/pixi-trampoline-x86_64-unknown-linux-musl.zst
diff --git a/tests/data/channels/channels/trampoline_path_channel/linux-64/dummy-trampoline-path-0.1.0-hb0f4dca_0.conda b/tests/data/channels/channels/trampoline_path_channel/linux-64/dummy-trampoline-path-0.1.0-hb0f4dca_0.conda
diff --git a/tests/data/channels/channels/trampoline_path_channel/linux-64/repodata.json b/tests/data/channels/channels/trampoline_path_channel/linux-64/repodata.json
@@ -0,0 +1,23 @@
+{
+  "info": {
+    "subdir": "linux-64"
+  },
+  "packages": {},
+  "packages.conda": {
+    "dummy-trampoline-path-0.1.0-hb0f4dca_0.conda": {
+      "arch": "x86_64",
+      "build": "hb0f4dca_0",
+      "build_number": 0,
+      "depends": [],
+      "md5": "72c665e2d984d359290d5f1959fedd04",
+      "name": "dummy-trampoline-path",
+      "platform": "linux",
+      "sha256": "068ad10a766de3df094c60b6b1a0f3051e738dc197964b58094d3e6981ef80de",
+      "size": 1381,
+      "subdir": "linux-64",
+      "timestamp": 1732292078964,
+      "version": "0.1.0"
+    }
+  },
+  "repodata_version": 2
+}
diff --git a/tests/data/channels/channels/trampoline_path_channel/noarch/repodata.json b/tests/data/channels/channels/trampoline_path_channel/noarch/repodata.json
@@ -0,0 +1,8 @@
+{
+  "info": {
+    "subdir": "noarch"
+  },
+  "packages": {},
+  "packages.conda": {},
+  "repodata_version": 2
+}
diff --git a/tests/data/channels/channels/trampoline_path_channel/osx-64/dummy-trampoline-path-0.1.0-h0dc7051_0.conda b/tests/data/channels/channels/trampoline_path_channel/osx-64/dummy-trampoline-path-0.1.0-h0dc7051_0.conda
diff --git a/tests/data/channels/channels/trampoline_path_channel/osx-64/repodata.json b/tests/data/channels/channels/trampoline_path_channel/osx-64/repodata.json
@@ -0,0 +1,23 @@
+{
+  "info": {
+    "subdir": "osx-64"
+  },
+  "packages": {},
+  "packages.conda": {
+    "dummy-trampoline-path-0.1.0-h0dc7051_0.conda": {
+      "arch": "x86_64",
+      "build": "h0dc7051_0",
+      "build_number": 0,
+      "depends": [],
+      "md5": "92f5ed46e9a430d6e97dae052ac7d735",
+      "name": "dummy-trampoline-path",
+      "platform": "osx",
+      "sha256": "3d73a352067e6b64e3da54e7eef20d3906096ec05bc8c191da11abcb39b5a16b",
+      "size": 1373,
+      "subdir": "osx-64",
+      "timestamp": 1732292079037,
+      "version": "0.1.0"
+    }
+  },
+  "repodata_version": 2
+}
diff --git a/tests/data/channels/channels/trampoline_path_channel/osx-arm64/dummy-trampoline-path-0.1.0-h60d57d3_0.conda b/tests/data/channels/channels/trampoline_path_channel/osx-arm64/dummy-trampoline-path-0.1.0-h60d57d3_0.conda
diff --git a/tests/data/channels/channels/trampoline_path_channel/osx-arm64/repodata.json b/tests/data/channels/channels/trampoline_path_channel/osx-arm64/repodata.json
@@ -0,0 +1,23 @@
+{
+  "info": {
+    "subdir": "osx-arm64"
+  },
+  "packages": {},
+  "packages.conda": {
+    "dummy-trampoline-path-0.1.0-h60d57d3_0.conda": {
+      "arch": "arm64",
+      "build": "h60d57d3_0",
+      "build_number": 0,
+      "depends": [],
+      "md5": "0f918d9648524ba9d788805239c91a9f",
+      "name": "dummy-trampoline-path",
+      "platform": "osx",
+      "sha256": "8ffa63de7f3ff1436e1b95ff19b7cb8b316d1de8855fa3b7cccfd057af84ec27",
+      "size": 1374,
+      "subdir": "osx-arm64",
+      "timestamp": 1732292079,
+      "version": "0.1.0"
+    }
+  },
+  "repodata_version": 2
+}
diff --git a/tests/data/channels/channels/trampoline_path_channel/win-64/dummy-trampoline-path-0.1.0-h9490d1a_0.conda b/tests/data/channels/channels/trampoline_path_channel/win-64/dummy-trampoline-path-0.1.0-h9490d1a_0.conda
diff --git a/tests/data/channels/channels/trampoline_path_channel/win-64/repodata.json b/tests/data/channels/channels/trampoline_path_channel/win-64/repodata.json
@@ -0,0 +1,23 @@
+{
+  "info": {
+    "subdir": "win-64"
+  },
+  "packages": {},
+  "packages.conda": {
+    "dummy-trampoline-path-0.1.0-h9490d1a_0.conda": {
+      "arch": "x86_64",
+      "build": "h9490d1a_0",
+      "build_number": 0,
+      "depends": [],
+      "md5": "a00d5b897c3e64e4d41b1af066161ebd",
+      "name": "dummy-trampoline-path",
+      "platform": "win",
+      "sha256": "5514fbf781e0f1e953ae5031bd17ed693ec945c675bd809b5b42868b8dd3205e",
+      "size": 1375,
+      "subdir": "win-64",
+      "timestamp": 1732292078932,
+      "version": "0.1.0"
+    }
+  },
+  "repodata_version": 2
+}
diff --git a/tests/data/channels/mappings.toml b/tests/data/channels/mappings.toml
@@ -6,3 +6,4 @@
 "non_self_expose_channel_2.yaml" = "non_self_expose_channel_2"
 "trampoline/trampoline_1.yaml" = "trampoline_1"
 "trampoline/trampoline_2.yaml" = "trampoline_2"
+"trampoline/trampoline_path.yaml" = "trampoline_path_channel"
diff --git a/tests/data/channels/recipes/trampoline/print_path.bat b/tests/data/channels/recipes/trampoline/print_path.bat
@@ -0,0 +1,2 @@
+@echo off
+echo %PATH%
diff --git a/tests/data/channels/recipes/trampoline/print_path.sh b/tests/data/channels/recipes/trampoline/print_path.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+echo $PATH
diff --git a/tests/data/channels/recipes/trampoline/trampoline_path.yaml b/tests/data/channels/recipes/trampoline/trampoline_path.yaml
@@ -0,0 +1,24 @@
+recipe:
+  name: trampoline
+  version: 1.0.0
+
+outputs:
+  - package:
+      name: dummy-trampoline-path
+      version: 0.1.0
+    source:
+      path: .
+
+    build:
+      script:
+        - mkdir -p $PREFIX/bin
+        - if: win
+          then:
+            - mkdir -p $PREFIX/etc/conda/activate.d
+            - echo "set PATH=%PATH%;/test/path" > $PREFIX/etc/conda/activate.d/activate-trampoline.bat
+            - mv print_path.bat $PREFIX/bin/dummy-trampoline-path.bat
+          else:
+            - mkdir -p $PREFIX/etc/conda/activate.d
+            - echo "export PATH=/test/path:\$PATH" > $PREFIX/etc/conda/activate.d/activate-trampoline.sh
+            - mv print_path.sh $PREFIX/bin/dummy-trampoline-path
+            - chmod +x $PREFIX/bin/dummy-trampoline-path
diff --git a/tests/integration_python/global/conftest.py b/tests/integration_python/global/conftest.py
@@ -10,3 +10,8 @@ def trampoline_channel_1(channels: Path) -> str:
 @pytest.fixture
 def trampoline_channel_2(channels: Path) -> str:
     return channels.joinpath("trampoline_2").as_uri()
+
+
+@pytest.fixture
+def trampoline_path_channel(channels: Path) -> str:
+    return channels.joinpath("trampoline_path_channel").as_uri()
diff --git a/tests/integration_python/global/test_trampoline.py b/tests/integration_python/global/test_trampoline.py
@@ -2,6 +2,7 @@
 import pathlib
 from pathlib import Path
 import platform
+import os
 
 from ..common import verify_cli_command, exec_extension, is_binary
 
@@ -227,3 +228,33 @@ def test_trampoline_migrate_with_newer_trampoline(
         stderr_contains="Environment dummy-trampoline was already up-to-date",
         stderr_excludes="Updated executable dummy-trampoline of environment dummy-trampoline",
     )
+
+
+def test_trampoline_extends_path(pixi: Path, tmp_path: Path, trampoline_path_channel: str) -> None:
+    env = {"PIXI_HOME": str(tmp_path)}
+
+    dummy_trampoline_path = tmp_path / "bin" / exec_extension("dummy-trampoline-path")
+
+    verify_cli_command(
+        [
+            pixi,
+            "global",
+            "install",
+            "--channel",
+            trampoline_path_channel,
+            "dummy-trampoline-path",
+        ],
+        env=env,
+    )
+
+    verify_cli_command(
+        [dummy_trampoline_path],
+        stdout_contains=["/test/path", os.environ["PATH"]],
+    )
+
+    os.environ["PATH"] = "/another/test/path" + os.pathsep + os.environ["PATH"]
+
+    verify_cli_command(
+        [dummy_trampoline_path],
+        stdout_contains=["/another/test/path", "/test/path"],
+    )
