fix flakes failures

This commit is contained in:
holger krekel 2014-01-29 10:20:13 +01:00
parent 2dade6ed00
commit 505a34bb85
5 changed files with 4 additions and 5 deletions

View File

@ -415,7 +415,7 @@ def test_rewritten():
reason='packages without __init__.py not supported on python 2') reason='packages without __init__.py not supported on python 2')
def test_package_without__init__py(self, testdir): def test_package_without__init__py(self, testdir):
pkg = testdir.mkdir('a_package_without_init_py') 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") testdir.makepyfile("import a_package_without_init_py.module")
assert testdir.runpytest().ret == 0 assert testdir.runpytest().ret == 0

View File

@ -1,4 +1,4 @@
import py, pytest import pytest
def setup_module(mod): def setup_module(mod):
mod.nose = pytest.importorskip("nose") mod.nose = pytest.importorskip("nose")

View File

@ -1,4 +1,3 @@
import py
import pytest import pytest
import os import os
from _pytest.pytester import HookRecorder from _pytest.pytester import HookRecorder

View File

@ -1,4 +1,4 @@
import pytest, py import pytest
class SessionTests: class SessionTests:
def test_basic_testitem_events(self, testdir): def test_basic_testitem_events(self, testdir):

View File

@ -1,4 +1,4 @@
import py, pytest import pytest
from _pytest.tmpdir import tmpdir, TempdirHandler from _pytest.tmpdir import tmpdir, TempdirHandler