[svn r38078] some fixes and test skips for win32 (otherwise all tests
pass for me on win32) --HG-- branch : trunk
This commit is contained in:
parent
d11aec0b42
commit
0b7854d722
|
@ -44,6 +44,8 @@ def setup_pkg(testname):
|
|||
return pkgpath
|
||||
|
||||
def test_run_tests():
|
||||
if py.std.sys.platform == "win32":
|
||||
py.test.skip("update_website is not supposed to be run from win32")
|
||||
pkgpath = setup_pkg('update_website_run_tests')
|
||||
errors = update_website.run_tests(pkgpath)
|
||||
assert not errors
|
||||
|
|
|
@ -183,7 +183,7 @@ def gethomedir():
|
|||
homedir = os.environ.get('HOME', '')
|
||||
if not homedir:
|
||||
homedir = os.environ.get('HOMEPATH', '.')
|
||||
return homedir
|
||||
return os.path.abspath(homedir)
|
||||
|
||||
def getpath_relto_home(targetpath):
|
||||
import os
|
||||
|
|
|
@ -17,8 +17,6 @@ from py.__.test.rsession.reporter import LocalReporter, RemoteReporter
|
|||
from py.__.test.session import Session
|
||||
from py.__.test.outcome import Skipped, Failed
|
||||
|
||||
old_fork = os.fork
|
||||
|
||||
class AbstractSession(Session):
|
||||
"""
|
||||
An abstract session executes collectors/items through a runner.
|
||||
|
|
|
@ -7,9 +7,9 @@ from py.__.test.rsession.executor import RunExecutor, BoxExecutor,\
|
|||
from py.__.test.rsession.outcome import ReprOutcome
|
||||
from py.__.test.rsession.testing.basetest import BasicRsessionTest
|
||||
|
||||
#def setup_module(mod):
|
||||
# mod.rootdir = py.path.local(py.__file__).dirpath().dirpath()
|
||||
# mod.config = py.test.config._reparse([mod.rootdir])
|
||||
def setup_module(mod):
|
||||
if py.std.sys.platform == "win32":
|
||||
py.test.skip("skipping executor tests (some require os.fork)")
|
||||
|
||||
class ItemTestPassing(py.test.Item):
|
||||
def run(self):
|
||||
|
|
|
@ -11,6 +11,8 @@ from py.__.test.rsession.testing.test_hostmanage import DirSetup
|
|||
|
||||
def setup_module(mod):
|
||||
mod.pkgdir = py.path.local(py.__file__).dirpath()
|
||||
if py.std.sys.platform == "win32":
|
||||
py.test.skip("rsession tests disabled for win32")
|
||||
|
||||
def test_example_tryiter():
|
||||
events = []
|
||||
|
|
Loading…
Reference in New Issue