From af9f744b13fcababd706e893a1723bfc12d283b8 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Fri, 6 Mar 2020 05:12:54 -0500 Subject: [PATCH] Mark tests as xfail until root cause can be determined and corrected. Workaround for #7806. --- tests/conftest.py | 9 +++++++++ tests/functional/test_install.py | 1 + tests/functional/test_install_user.py | 5 +++++ tests/functional/test_install_wheel.py | 1 + tests/functional/test_uninstall_user.py | 1 + 5 files changed, 17 insertions(+) diff --git a/tests/conftest.py b/tests/conftest.py index 3430e271d77..ba2a222dfb1 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -58,6 +58,15 @@ def pytest_collection_modifyitems(config, items): item.add_marker(pytest.mark.skip( 'Incompatible with venv')) + if ( + sys.platform == 'darwin' and + sys._framework and + item.get_closest_marker('incompatible_with_framework') + ): + item.add_marker( + pytest.mark.xfail( + reason="Mismatched prefix on framework builds. Ref #7806")) + module_path = os.path.relpath( item.module.__file__, os.path.commonprefix([__file__, item.module.__file__]), diff --git a/tests/functional/test_install.py b/tests/functional/test_install.py index 1ea9db26e4b..0d9daa67ff9 100644 --- a/tests/functional/test_install.py +++ b/tests/functional/test_install.py @@ -1678,6 +1678,7 @@ def test_target_install_ignores_distutils_config_install_prefix(script): @pytest.mark.incompatible_with_test_venv +@pytest.mark.incompatible_with_framework def test_user_config_accepted(script): # user set in the config file is parsed as 0/1 instead of True/False. # Check that this doesn't cause a problem. diff --git a/tests/functional/test_install_user.py b/tests/functional/test_install_user.py index 2cc91f56c75..0966839d5c8 100644 --- a/tests/functional/test_install_user.py +++ b/tests/functional/test_install_user.py @@ -58,6 +58,7 @@ def test_install_subversion_usersite_editable_with_distribute( result.assert_installed('INITools', use_user_site=True) @pytest.mark.incompatible_with_test_venv + @pytest.mark.incompatible_with_framework def test_install_from_current_directory_into_usersite( self, script, data, with_wheel): """ @@ -98,6 +99,7 @@ def test_install_user_venv_nositepkgs_fails(self, virtualenv, @pytest.mark.network @pytest.mark.incompatible_with_test_venv + @pytest.mark.incompatible_with_framework def test_install_user_conflict_in_usersite(self, script): """ Test user install with conflict in usersite updates usersite. @@ -122,6 +124,7 @@ def test_install_user_conflict_in_usersite(self, script): @pytest.mark.network @pytest.mark.incompatible_with_test_venv + @pytest.mark.incompatible_with_framework def test_install_user_conflict_in_globalsite(self, virtualenv, script): """ Test user install with conflict in global site ignores site and @@ -153,6 +156,7 @@ def test_install_user_conflict_in_globalsite(self, virtualenv, script): @pytest.mark.network @pytest.mark.incompatible_with_test_venv + @pytest.mark.incompatible_with_framework def test_upgrade_user_conflict_in_globalsite(self, virtualenv, script): """ Test user install/upgrade with conflict in global site ignores site and @@ -183,6 +187,7 @@ def test_upgrade_user_conflict_in_globalsite(self, virtualenv, script): @pytest.mark.network @pytest.mark.incompatible_with_test_venv + @pytest.mark.incompatible_with_framework def test_install_user_conflict_in_globalsite_and_usersite( self, virtualenv, script): """ diff --git a/tests/functional/test_install_wheel.py b/tests/functional/test_install_wheel.py index 6f7b77597ed..1bdc8ac6204 100644 --- a/tests/functional/test_install_wheel.py +++ b/tests/functional/test_install_wheel.py @@ -270,6 +270,7 @@ def test_wheel_record_lines_in_deterministic_order(script, data): @pytest.mark.incompatible_with_test_venv +@pytest.mark.incompatible_with_framework def test_install_user_wheel(script, shared_data, with_wheel, tmpdir): """ Test user install from wheel (that has a script) diff --git a/tests/functional/test_uninstall_user.py b/tests/functional/test_uninstall_user.py index ed277739a1f..6edf2118b99 100644 --- a/tests/functional/test_uninstall_user.py +++ b/tests/functional/test_uninstall_user.py @@ -10,6 +10,7 @@ @pytest.mark.incompatible_with_test_venv +@pytest.mark.incompatible_with_framework class Tests_UninstallUserSite: @pytest.mark.network