diff options
| author | Armin Rigo <arigo@tunes.org> | 2019-04-19 17:55:35 +0200 |
|---|---|---|
| committer | Armin Rigo <arigo@tunes.org> | 2019-04-19 17:55:35 +0200 |
| commit | 10bfbf281e255a3e74ef7ce607552fc90fa703da (patch) | |
| tree | 3680091715e786896d871ca938681a1f413bb28f | |
| parent | 163a3ec7c2f009cfa3b6a587ed6fade018b085ff (diff) | |
| download | cffi-10bfbf281e255a3e74ef7ce607552fc90fa703da.tar.gz | |
Modernize this, because very recent pytests crash when seeing the
old way
| -rw-r--r-- | testing/cffi0/test_zintegration.py | 6 | ||||
| -rw-r--r-- | testing/embedding/test_performance.py | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/testing/cffi0/test_zintegration.py b/testing/cffi0/test_zintegration.py index d56dac2..4cce595 100644 --- a/testing/cffi0/test_zintegration.py +++ b/testing/cffi0/test_zintegration.py @@ -1,11 +1,13 @@ import py, os, sys, shutil import subprocess from testing.udir import udir +import pytest if sys.platform == 'win32': - py.test.skip('snippets do not run on win32') + pytestmark = pytest.mark.skip('snippets do not run on win32') if sys.version_info < (2, 7): - py.test.skip('fails e.g. on a Debian/Ubuntu which patches virtualenv' + pytestmark = pytest.mark.skip( + 'fails e.g. on a Debian/Ubuntu which patches virtualenv' ' in a non-2.6-friendly way') def create_venv(name): diff --git a/testing/embedding/test_performance.py b/testing/embedding/test_performance.py index f9f2605..a0e8458 100644 --- a/testing/embedding/test_performance.py +++ b/testing/embedding/test_performance.py @@ -2,8 +2,8 @@ import sys from testing.embedding.test_basic import EmbeddingTests if sys.platform == 'win32': - import py - py.test.skip("written with POSIX functions") + import pytest + pytestmark = pytest.mark.skip("written with POSIX functions") class TestPerformance(EmbeddingTests): |