Merge pull request #63 from pytest-dev/fix-pytest3

Fix pytest3

Author: nicoddemus

test_pytest_mock.py

@@ -176,7 +176,7 @@ def __test_failure_message(self, mocker, **kwargs):
         stub = mocker.stub(**kwargs)
         with pytest.raises(AssertionError) as exc_info:
             stub.assert_called_with()
-        assert exc_info.value.msg == expected_message
+        assert str(exc_info.value) == expected_message
 
     def test_failure_message_with_no_name(self, mocker):
         self.__test_failure_message(mocker)
@@ -352,7 +352,7 @@ def assert_argument_introspection(left, right):
         #       test was run by examining sys.argv
         verbose = any(a.startswith('-v') for a in sys.argv)
         expected = '\n  '.join(util._compare_eq_iterable(left, right, verbose))
-        assert expected in e.msg
+        assert expected in str(e)
     else:
         raise AssertionError("DID NOT RAISE")
 

tox.ini

@@ -1,14 +1,16 @@
 [tox]
 # note that tox expects interpreters to be found at C:\PythonXY,
 # with XY being python version ("27" or "34") for instance
-envlist = py{26,27,33,34,35}-pytest{27,28},linting
+envlist = py{26,27,33,34,35}-pytest{27,28,30},linting
 
 [testenv]
 passenv = USER USERNAME
 deps =
     coverage
     pytest27: pytest==2.7.3
     pytest28: pytest==2.8.7
+    # temporary until pytest-dev/pytest#1935 is merged
+    pytest30: git+https://github.com/nicoddemus/pytest@assert-rewrite-dev-plugins
 commands = coverage run --append --source=pytest_mock.py -m pytest test_pytest_mock.py