1 new commit in pytest:
https://bitbucket.org/hpk42/pytest/commits/0457bfb8ce8f/
Changeset: 0457bfb8ce8f
User: hpk42
Date: 2014-06-16 11:27:32
Summary: fix flakes issues
Affected #: 3 files
diff -r 67bfeba93feec611cf75f96c43e41b20754dfe36 -r
0457bfb8ce8f2cf0f8481142122fa634726dbdfc testing/test_assertion.py
--- a/testing/test_assertion.py
+++ b/testing/test_assertion.py
@@ -4,7 +4,6 @@
import py, pytest
import _pytest.assertion as plugin
from _pytest.assertion import reinterpret
-from _pytest.assertion import util
needsnewassert = pytest.mark.skipif("sys.version_info < (2,6)")
diff -r 67bfeba93feec611cf75f96c43e41b20754dfe36 -r
0457bfb8ce8f2cf0f8481142122fa634726dbdfc testing/test_capture.py
--- a/testing/test_capture.py
+++ b/testing/test_capture.py
@@ -65,7 +65,7 @@
assert parser._groups[0].options[0].default == "sys"
@needsosdup
- @pytest.mark.parametrize("method",
+ @pytest.mark.parametrize("method",
['no', 'sys', pytest.mark.skipif('not hasattr(os, "dup")', 'fd')])
def test_capturing_basic_api(self, method):
capouter = StdCaptureFD()
@@ -750,7 +750,7 @@
finally:
os.dup2(new_fd, fd)
-
+
class TestStdCapture:
captureclass = staticmethod(StdCapture)
@@ -1011,20 +1011,3 @@
""")
assert "atexit" not in result.stderr.str()
-def test_close_and_capture_again(testdir):
- testdir.makepyfile("""
- import os
- def test_close():
- os.close(1)
- def test_capture_again():
- os.write(1, b"hello\\n")
- assert 0
- """)
- result = testdir.runpytest()
- result.stdout.fnmatch_lines("""
- *test_capture_again*
- *assert 0*
- *stdout*
- *hello*
- """)
-
diff -r 67bfeba93feec611cf75f96c43e41b20754dfe36 -r
0457bfb8ce8f2cf0f8481142122fa634726dbdfc testing/test_config.py
--- a/testing/test_config.py
+++ b/testing/test_config.py
@@ -123,8 +123,8 @@
parser.addoption("--hello")
""")
config = testdir.parseconfig()
- pytest.raises(pytest.skip.Exception,
- "config.getvalueorskip('hello')")
+ with pytest.raises(pytest.skip.Exception):
+ config.getvalueorskip('hello')
def test_getoption(self, testdir):
config = testdir.parseconfig()
Repository URL: https://bitbucket.org/hpk42/pytest/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
_______________________________________________
pytest-commit mailing list
pytest-commit@python.org
https://mail.python.org/mailman/listinfo/pytest-commit
