diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2015-01-02 18:38:36 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2015-01-02 18:38:36 -0500 |
| commit | 16ee10c47583a4a2b7480af6fc5a205343acfdfd (patch) | |
| tree | 7cfbb6d488a92fa01ddb86d6f226f549ad26a01e /setuptools/tests/test_integration.py | |
| parent | 866ff739f6e64aaaefcf7816263410527c9f55f7 (diff) | |
| parent | 41f2c5ec8dd669747f3cfd8d6b2ae9a40d219545 (diff) | |
| download | external_python_setuptools-16ee10c47583a4a2b7480af6fc5a205343acfdfd.tar.gz external_python_setuptools-16ee10c47583a4a2b7480af6fc5a205343acfdfd.tar.bz2 external_python_setuptools-16ee10c47583a4a2b7480af6fc5a205343acfdfd.zip | |
Merge with 10.2.1
--HG--
branch : feature/issue-229
Diffstat (limited to 'setuptools/tests/test_integration.py')
| -rw-r--r-- | setuptools/tests/test_integration.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/setuptools/tests/test_integration.py b/setuptools/tests/test_integration.py index 8d6c1e55..3a6abeaa 100644 --- a/setuptools/tests/test_integration.py +++ b/setuptools/tests/test_integration.py @@ -27,7 +27,7 @@ def install_context(request, tmpdir, monkeypatch): def fin(): # undo the monkeypatch, particularly needed under # windows because of kept handle on cwd - monkeypatch.undo() + monkeypatch.undo() new_cwd.remove() user_base.remove() user_site.remove() @@ -71,7 +71,6 @@ def test_virtualenvwrapper(install_context): 'virtualenvwrapper', 'hook_loader.py') -@pytest.mark.xfail def test_pbr(install_context): _install_one('pbr', install_context, 'pbr', 'core.py') |