1 new commit in pytest: https://bitbucket.org/hpk42/pytest/commits/e9b0d7ba6a50/ Changeset: e9b0d7ba6a50 User: hpk42 Date: 2014-01-29 10:20:13 Summary: fix flakes failures Affected #: 5 files
diff -r 0b5c70a8ee571a2d518a2c7c3733098f2326425e -r e9b0d7ba6a503702bbfcca9189a9e01ca20f673c testing/test_assertrewrite.py --- a/testing/test_assertrewrite.py +++ b/testing/test_assertrewrite.py @@ -415,7 +415,7 @@ reason='packages without __init__.py not supported on python 2') def test_package_without__init__py(self, testdir): pkg = testdir.mkdir('a_package_without_init_py') - mod = pkg.join('module.py').ensure() + pkg.join('module.py').ensure() testdir.makepyfile("import a_package_without_init_py.module") assert testdir.runpytest().ret == 0 diff -r 0b5c70a8ee571a2d518a2c7c3733098f2326425e -r e9b0d7ba6a503702bbfcca9189a9e01ca20f673c testing/test_nose.py --- a/testing/test_nose.py +++ b/testing/test_nose.py @@ -1,4 +1,4 @@ -import py, pytest +import pytest def setup_module(mod): mod.nose = pytest.importorskip("nose") diff -r 0b5c70a8ee571a2d518a2c7c3733098f2326425e -r e9b0d7ba6a503702bbfcca9189a9e01ca20f673c testing/test_pytester.py --- a/testing/test_pytester.py +++ b/testing/test_pytester.py @@ -1,4 +1,3 @@ -import py import pytest import os from _pytest.pytester import HookRecorder diff -r 0b5c70a8ee571a2d518a2c7c3733098f2326425e -r e9b0d7ba6a503702bbfcca9189a9e01ca20f673c testing/test_session.py --- a/testing/test_session.py +++ b/testing/test_session.py @@ -1,4 +1,4 @@ -import pytest, py +import pytest class SessionTests: def test_basic_testitem_events(self, testdir): diff -r 0b5c70a8ee571a2d518a2c7c3733098f2326425e -r e9b0d7ba6a503702bbfcca9189a9e01ca20f673c testing/test_tmpdir.py --- a/testing/test_tmpdir.py +++ b/testing/test_tmpdir.py @@ -1,4 +1,4 @@ -import py, pytest +import pytest from _pytest.tmpdir import tmpdir, TempdirHandler 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