diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2015-04-15 01:49:46 -0400 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2015-04-15 01:49:46 -0400 |
| commit | df9500ac5da25ece5f1f792e7834cc714cc71b70 (patch) | |
| tree | 96086c26ad797e5ae2e2aa43883b55e318bc0fff /setuptools/tests/test_integration.py | |
| parent | a0cd32ea25ab4465507da2be15f3d05304babe99 (diff) | |
| parent | 82d003629ef23fd7f0dc2fb71d5edc937271ffd8 (diff) | |
| download | external_python_setuptools-df9500ac5da25ece5f1f792e7834cc714cc71b70.tar.gz external_python_setuptools-df9500ac5da25ece5f1f792e7834cc714cc71b70.tar.bz2 external_python_setuptools-df9500ac5da25ece5f1f792e7834cc714cc71b70.zip | |
Merged in toabctl/setuptools/fix-type-error-skip-reason (pull request #127)
Fix TypeError for pytest.skip()
Diffstat (limited to 'setuptools/tests/test_integration.py')
| -rw-r--r-- | setuptools/tests/test_integration.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/setuptools/tests/test_integration.py b/setuptools/tests/test_integration.py index 90bb4313..07f06db2 100644 --- a/setuptools/tests/test_integration.py +++ b/setuptools/tests/test_integration.py @@ -28,7 +28,7 @@ def setup_module(module): try: urlopen('https://pypi.python.org/pypi') except Exception as exc: - pytest.skip(reason=str(exc)) + pytest.skip(str(exc)) @pytest.fixture |