Skip to content

Commit

Permalink
Mark tests as xfail until root cause can be determined and corrected.…
Browse files Browse the repository at this point in the history
… Workaround for #7806.
  • Loading branch information
jaraco committed Mar 6, 2020
1 parent 60d6402 commit af9f744
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 0 deletions.
9 changes: 9 additions & 0 deletions tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -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__]),
Expand Down
1 change: 1 addition & 0 deletions tests/functional/test_install.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
5 changes: 5 additions & 0 deletions tests/functional/test_install_user.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
"""
Expand Down Expand Up @@ -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.
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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):
"""
Expand Down
1 change: 1 addition & 0 deletions tests/functional/test_install_wheel.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions tests/functional/test_uninstall_user.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@


@pytest.mark.incompatible_with_test_venv
@pytest.mark.incompatible_with_framework
class Tests_UninstallUserSite:

@pytest.mark.network
Expand Down

0 comments on commit af9f744

Please sign in to comment.