Merge pull request #105 from nicoddemus/assert-rewrite-tests

Skip tests which require assertion rewriting when it is disabled

Author: nicoddemus

.gitignore

@@ -31,6 +31,7 @@ htmlcov/
 .tox/
 .coverage
 .cache
+.pytest_cache
 nosetests.xml
 coverage.xml
 

.travis.yml

@@ -18,6 +18,8 @@ jobs:
   include:
     - python: '3.6'
       env: TOXENV=linting
+    - python: '3.6'
+      env: TOXENV=norewrite
     - stage: deploy
       python: '3.6'
       install: pip install -U setuptools setuptools_scm

CHANGELOG.rst

@@ -1,10 +1,15 @@
 1.7.1
 -----
 
-* Fix ``mock`` requirements in Python 2. Thanks `@ghisvail`_ for the report.
+* Fix ``mock`` requirements in Python 2. Thanks `@ghisvail`_ for the report (`#101`_).
+
+**Internal change**
+
+* Some tests in ``pytest-mock``'s suite are skipped if assertion rewriting is disabled (`#102`_).
 
 .. _@ghisvail: https://github.com/ghisvail
 .. _#101: https://github.com/pytest-dev/pytest-mock/issues/101
+.. _#102: https://github.com/pytest-dev/pytest-mock/issues/102
 
 1.7.0
 -----

test_pytest_mock.py

@@ -13,6 +13,19 @@
                                reason='could not make work on pypy')
 
 
+@pytest.fixture
+def needs_assert_rewrite(pytestconfig):
+    """
+    Fixture which skips requesting test if assertion rewrite is disabled (#102)
+
+    Making this a fixture to avoid acessing pytest's config in the global context.
+    """
+    option = pytestconfig.getoption('assertmode')
+    if option != 'rewrite':
+        pytest.skip('this test needs assertion rewrite to work but current option '
+                    'is "{}"'.format(option))
+
+
 class UnixFS(object):
     """
     Wrapper to os functions to simulate a Unix file system, used for testing
@@ -375,6 +388,7 @@ def test_assert_called_once_with_wrapper(mocker):
         stub.assert_called_once_with("foo")
 
 
+@pytest.mark.usefixtures('needs_assert_rewrite')
 def test_assert_called_args_with_introspection(mocker):
     stub = mocker.stub()
 
@@ -390,6 +404,7 @@ def test_assert_called_args_with_introspection(mocker):
         stub.assert_called_once_with(*wrong_args)
 
 
+@pytest.mark.usefixtures('needs_assert_rewrite')
 def test_assert_called_kwargs_with_introspection(mocker):
     stub = mocker.stub()
 
@@ -510,6 +525,7 @@ def runpytest_subprocess(testdir, *args):
         return testdir.runpytest(*args)
 
 
+@pytest.mark.usefixtures('needs_assert_rewrite')
 def test_detailed_introspection(testdir):
     """Check that the "mock_use_standalone" is being used.
     """

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py{27,34,35,36}-pytest{30,31,32},linting
+envlist = py{27,34,35,36}-pytest{30,31,32,33,34},linting,norewrite
 
 [testenv]
 passenv = USER USERNAME
@@ -9,9 +9,14 @@ deps =
     pytest31: pytest~=3.1
     pytest32: pytest~=3.2
     pytest33: pytest~=3.3
+    pytest34: pytest~=3.4
 commands =
     coverage run --append --source=pytest_mock.py -m pytest test_pytest_mock.py
 
+[testenv:norewrite]
+commands =
+    pytest test_pytest_mock.py --assert=plain -ra
+
 [testenv:linting]
 skip_install=True
 deps =