Avoid filtering Python executables names during install tests

Author: zanieb

crates/uv/tests/it/common/mod.rs

@@ -219,7 +219,8 @@ impl TestContext {
     pub fn with_filtered_python_keys(mut self) -> Self {
         // Filter platform keys
         self.filters.push((
-            r"((?:cpython|pypy)-\d+\.\d+(?:\.(?:\[X\]|\d+))?[a-z]?(?:\+[a-z]+)?)-.*".to_string(),
+            r"((?:cpython|pypy)-\d+\.\d+(?:\.(?:\[X\]|\d+))?[a-z]?(?:\+[a-z]+)?)-[a-z0-9]+-[a-z0-9]+-[a-z]+"
+                .to_string(),
             "$1-[PLATFORM]".to_string(),
         ));
         self

crates/uv/tests/it/python_install.rs

@@ -85,7 +85,7 @@ fn python_install() {
     ----- stderr -----
     Searching for Python versions matching: Python 3.13
     Uninstalled Python 3.13.0 in [TIME]
-     - cpython-3.13.0-[PLATFORM]
+     - cpython-3.13.0-[PLATFORM] (python3.13)
     "###);
 }
 
@@ -103,7 +103,7 @@ fn python_install_preview() {
 
     ----- stderr -----
     Installed Python 3.13.0 in [TIME]
-     + cpython-3.13.0-[PLATFORM]
+     + cpython-3.13.0-[PLATFORM] (python3.13)
     "###);
 
     let bin_python = context
@@ -147,7 +147,7 @@ fn python_install_preview() {
 
     ----- stderr -----
     Installed Python 3.13.0 in [TIME]
-     ~ cpython-3.13.0-[PLATFORM]
+     ~ cpython-3.13.0-[PLATFORM] (python3.13)
     "###);
 
     // The executable should still be present in the bin directory
@@ -161,7 +161,7 @@ fn python_install_preview() {
 
     ----- stderr -----
     Installed Python 3.13.0 in [TIME]
-     + cpython-3.13.0-[PLATFORM]
+     + cpython-3.13.0-[PLATFORM] (python3.13)
     "###);
 
     // The executable should still be present in the bin directory
@@ -188,7 +188,7 @@ fn python_install_preview() {
 
     ----- stderr -----
     Installed Python 3.13.0 in [TIME]
-     + cpython-3.13.0-[PLATFORM]
+     + cpython-3.13.0-[PLATFORM] (python3.13)
     "###);
 
     bin_python.assert(predicate::path::exists());
@@ -220,7 +220,7 @@ fn python_install_preview() {
     ----- stderr -----
     Searching for Python versions matching: Python 3.13
     Uninstalled Python 3.13.0 in [TIME]
-     - cpython-3.13.0-[PLATFORM]
+     - cpython-3.13.0-[PLATFORM] (python3.13)
     "###);
 
     // The executable should be removed
@@ -244,7 +244,7 @@ fn python_install_preview_upgrade() {
 
     ----- stderr -----
     Installed Python 3.12.5 in [TIME]
-     + cpython-3.12.5-[PLATFORM]
+     + cpython-3.12.5-[PLATFORM] (python3.12)
     "###);
 
     // Installing 3.12.4 should not replace the executable, but also shouldn't fail
@@ -262,7 +262,7 @@ fn python_install_preview_upgrade() {
         filters => context.filters(),
     }, {
         insta::assert_snapshot!(
-            read_link_path(&bin_python), @"[TEMP_DIR]/managed/cpython-3.12.5-[PLATFORM]"
+            read_link_path(&bin_python), @"[TEMP_DIR]/managed/cpython-3.12.5-[PLATFORM]/bin/python3.12"
         );
     });
 
@@ -281,7 +281,7 @@ fn python_install_preview_upgrade() {
         filters => context.filters(),
     }, {
         insta::assert_snapshot!(
-            read_link_path(&bin_python), @"[TEMP_DIR]/managed/cpython-3.12.5-[PLATFORM]"
+            read_link_path(&bin_python), @"[TEMP_DIR]/managed/cpython-3.12.5-[PLATFORM]/bin/python3.12"
         );
     });
 
@@ -293,14 +293,14 @@ fn python_install_preview_upgrade() {
 
     ----- stderr -----
     Installed Python 3.12.4 in [TIME]
-     + cpython-3.12.4-[PLATFORM]
+     + cpython-3.12.4-[PLATFORM] (python3.12)
     "###);
 
     insta::with_settings!({
         filters => context.filters(),
     }, {
         insta::assert_snapshot!(
-            read_link_path(&bin_python), @"[TEMP_DIR]/managed/cpython-3.12.4-[PLATFORM]"
+            read_link_path(&bin_python), @"[TEMP_DIR]/managed/cpython-3.12.4-[PLATFORM]/bin/python3.12"
         );
     });
 
@@ -312,14 +312,14 @@ fn python_install_preview_upgrade() {
 
     ----- stderr -----
     Installed Python 3.12.6 in [TIME]
-     + cpython-3.12.6-[PLATFORM]
+     + cpython-3.12.6-[PLATFORM] (python3.12)
     "###);
 
     insta::with_settings!({
         filters => context.filters(),
     }, {
         insta::assert_snapshot!(
-            read_link_path(&bin_python), @"[TEMP_DIR]/managed/cpython-3.12.6-[PLATFORM]"
+            read_link_path(&bin_python), @"[TEMP_DIR]/managed/cpython-3.12.6-[PLATFORM]/bin/python3.12"
         );
     });
 }
@@ -336,7 +336,7 @@ fn python_install_freethreaded() {
 
     ----- stderr -----
     Installed Python 3.13.0 in [TIME]
-     + cpython-3.13.0+freethreaded-[PLATFORM]
+     + cpython-3.13.0+freethreaded-[PLATFORM] (python3.13t)
     "###);
 
     let bin_python = context
@@ -391,8 +391,8 @@ fn python_install_freethreaded() {
     ----- stderr -----
     Searching for Python installations
     Uninstalled 2 versions in [TIME]
-     - cpython-3.13.0-[PLATFORM]
-     - cpython-3.13.0+freethreaded-[PLATFORM]
+     - cpython-3.13.0-[PLATFORM] (python3.13)
+     - cpython-3.13.0+freethreaded-[PLATFORM] (python3.13t)
     "###);
 }