From 505a34bb857675d8c6e5f73fee110a2cf6c151e9 Mon Sep 17 00:00:00 2001 From: holger krekel Date: Wed, 29 Jan 2014 10:20:13 +0100 Subject: [PATCH] fix flakes failures --- testing/test_assertrewrite.py | 2 +- testing/test_nose.py | 2 +- testing/test_pytester.py | 1 - testing/test_session.py | 2 +- testing/test_tmpdir.py | 2 +- 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/testing/test_assertrewrite.py b/testing/test_assertrewrite.py index d19ebd1d4..040dd0743 100644 --- a/testing/test_assertrewrite.py +++ b/testing/test_assertrewrite.py @@ -415,7 +415,7 @@ def test_rewritten(): 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 --git a/testing/test_nose.py b/testing/test_nose.py index 692759bc0..1eda30449 100644 --- 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 --git a/testing/test_pytester.py b/testing/test_pytester.py index cf171b2a4..b3c6cf795 100644 --- 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 --git a/testing/test_session.py b/testing/test_session.py index af31b9f8e..4b38c7efd 100644 --- 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 --git a/testing/test_tmpdir.py b/testing/test_tmpdir.py index a7870ff89..589a56a4c 100644 --- 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