@@ -1001,22 +1001,7 @@ mod tests {
10011001 ) )
10021002 } ;
10031003
1004- let expected_system_site_packages = if cfg ! ( target_os = "windows" ) {
1005- SystemPathBuf :: from ( & * format ! (
1006- r"\Python3.{}\Lib\site-packages" ,
1007- self . minor_version
1008- ) )
1009- } else if self . free_threaded {
1010- SystemPathBuf :: from ( & * format ! (
1011- "/Python3.{minor_version}/lib/python3.{minor_version}t/site-packages" ,
1012- minor_version = self . minor_version
1013- ) )
1014- } else {
1015- SystemPathBuf :: from ( & * format ! (
1016- "/Python3.{minor_version}/lib/python3.{minor_version}/site-packages" ,
1017- minor_version = self . minor_version
1018- ) )
1019- } ;
1004+ let expected_system_site_packages = self . expected_system_site_packages ( ) ;
10201005
10211006 if self_venv. system_site_packages {
10221007 assert_eq ! (
@@ -1051,33 +1036,33 @@ mod tests {
10511036 ) ;
10521037
10531038 let site_packages_directories = env. site_packages_directories ( & self . system ) . unwrap ( ) ;
1039+ let expected_site_packages = self . expected_system_site_packages ( ) ;
1040+ assert_eq ! (
1041+ site_packages_directories,
1042+ std:: slice:: from_ref( & expected_site_packages)
1043+ ) ;
1044+ }
10541045
1055- let expected_site_packages = if cfg ! ( target_os = "windows" ) {
1056- SystemPathBuf :: from ( & * format ! (
1057- r"\Python3.{}\Lib\site-packages" ,
1058- self . minor_version
1059- ) )
1046+ fn expected_system_site_packages ( & self ) -> SystemPathBuf {
1047+ let minor_version = self . minor_version ;
1048+ if cfg ! ( target_os = "windows" ) {
1049+ SystemPathBuf :: from ( & * format ! ( r"\Python3.{minor_version}\Lib\site-packages" ) )
10601050 } else if self . free_threaded {
10611051 SystemPathBuf :: from ( & * format ! (
1062- "/Python3.{minor_version}/lib/python3.{minor_version}t/site-packages" ,
1063- minor_version = self . minor_version
1052+ "/Python3.{minor_version}/lib/python3.{minor_version}t/site-packages"
10641053 ) )
10651054 } else {
10661055 SystemPathBuf :: from ( & * format ! (
1067- "/Python3.{minor_version}/lib/python3.{minor_version}/site-packages" ,
1068- minor_version = self . minor_version
1056+ "/Python3.{minor_version}/lib/python3.{minor_version}/site-packages"
10691057 ) )
1070- } ;
1071-
1072- assert_eq ! (
1073- site_packages_directories,
1074- [ expected_site_packages] . as_slice( )
1075- ) ;
1058+ }
10761059 }
10771060 }
10781061
10791062 #[ test]
10801063 fn can_find_site_packages_directory_no_virtual_env ( ) {
1064+ // Shouldn't be converted to an mdtest because mdtest automatically creates a
1065+ // pyvenv.cfg file for you if it sees you creating a `site-packages` directory.
10811066 let test = PythonEnvironmentTestCase {
10821067 system : TestSystem :: default ( ) ,
10831068 minor_version : 12 ,
@@ -1090,6 +1075,8 @@ mod tests {
10901075
10911076 #[ test]
10921077 fn can_find_site_packages_directory_no_virtual_env_freethreaded ( ) {
1078+ // Shouldn't be converted to an mdtest because mdtest automatically creates a
1079+ // pyvenv.cfg file for you if it sees you creating a `site-packages` directory.
10931080 let test = PythonEnvironmentTestCase {
10941081 system : TestSystem :: default ( ) ,
10951082 minor_version : 13 ,
@@ -1132,23 +1119,10 @@ mod tests {
11321119 ) ;
11331120 }
11341121
1135- #[ test]
1136- fn can_find_site_packages_directory_no_version_field_in_pyvenv_cfg ( ) {
1137- let test = PythonEnvironmentTestCase {
1138- system : TestSystem :: default ( ) ,
1139- minor_version : 12 ,
1140- free_threaded : false ,
1141- origin : SysPrefixPathOrigin :: VirtualEnvVar ,
1142- virtual_env : Some ( VirtualEnvironmentTestCase {
1143- pyvenv_cfg_version_field : None ,
1144- ..VirtualEnvironmentTestCase :: default ( )
1145- } ) ,
1146- } ;
1147- test. run ( ) ;
1148- }
1149-
11501122 #[ test]
11511123 fn can_find_site_packages_directory_venv_style_version_field_in_pyvenv_cfg ( ) {
1124+ // Shouldn't be converted to an mdtest because we want to assert
1125+ // that we parsed the `version` field correctly in `test.run()`.
11521126 let test = PythonEnvironmentTestCase {
11531127 system : TestSystem :: default ( ) ,
11541128 minor_version : 12 ,
@@ -1164,6 +1138,8 @@ mod tests {
11641138
11651139 #[ test]
11661140 fn can_find_site_packages_directory_uv_style_version_field_in_pyvenv_cfg ( ) {
1141+ // Shouldn't be converted to an mdtest because we want to assert
1142+ // that we parsed the `version` field correctly in `test.run()`.
11671143 let test = PythonEnvironmentTestCase {
11681144 system : TestSystem :: default ( ) ,
11691145 minor_version : 12 ,
@@ -1179,6 +1155,8 @@ mod tests {
11791155
11801156 #[ test]
11811157 fn can_find_site_packages_directory_virtualenv_style_version_field_in_pyvenv_cfg ( ) {
1158+ // Shouldn't be converted to an mdtest because we want to assert
1159+ // that we parsed the `version` field correctly in `test.run()`.
11821160 let test = PythonEnvironmentTestCase {
11831161 system : TestSystem :: default ( ) ,
11841162 minor_version : 12 ,
@@ -1209,6 +1187,9 @@ mod tests {
12091187
12101188 #[ test]
12111189 fn finds_system_site_packages ( ) {
1190+ // Can't be converted to an mdtest because the system installation's `sys.prefix`
1191+ // path is at a different location relative to the `pyvenv.cfg` file's `home` value
1192+ // on Windows.
12121193 let test = PythonEnvironmentTestCase {
12131194 system : TestSystem :: default ( ) ,
12141195 minor_version : 13 ,
@@ -1366,25 +1347,6 @@ mod tests {
13661347 ) ;
13671348 }
13681349
1369- /// See <https://github.com/astral-sh/ty/issues/430>
1370- #[ test]
1371- fn parsing_pyvenv_cfg_with_equals_in_value ( ) {
1372- let test = PythonEnvironmentTestCase {
1373- system : TestSystem :: default ( ) ,
1374- minor_version : 13 ,
1375- free_threaded : true ,
1376- origin : SysPrefixPathOrigin :: VirtualEnvVar ,
1377- virtual_env : Some ( VirtualEnvironmentTestCase {
1378- pyvenv_cfg_version_field : Some ( "version_info = 3.13" ) ,
1379- command_field : Some (
1380- r#"command = /.pyenv/versions/3.13.3/bin/python3.13 -m venv --without-pip --prompt="python-default/3.13.3" /somewhere-else/python/virtualenvs/python-default/3.13.3"# ,
1381- ) ,
1382- ..VirtualEnvironmentTestCase :: default ( )
1383- } ) ,
1384- } ;
1385- test. run ( ) ;
1386- }
1387-
13881350 #[ test]
13891351 fn parsing_pyvenv_cfg_with_key_but_no_value_fails ( ) {
13901352 let system = TestSystem :: default ( ) ;
0 commit comments