p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[svn r37914] cleaner test setup 

--HG--
branch : trunk
This commit is contained in:
hpk 2007-02-04 15:36:42 +01:00
parent 98b4dcf155
commit e4f5a2259c
1 changed files with 9 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
py/test/rsession/testing/test_rsession.py
View File

@ -10,28 +10,10 @@ from py.__.test.rsession.testing.test_slave import funcfail_spec,\
funcpass_spec, funcskip_spec, funcprint_spec, funcprintfail_spec, \ funcpass_spec, funcskip_spec, funcprint_spec, funcprintfail_spec, \
funcoptioncustom_spec funcoptioncustom_spec
from test_hostmanage import DirSetup
def setup_module(mod): def setup_module(mod):
mod.pkgdir = py.path.local(py.__file__).dirpath() mod.pkgdir = py.path.local(py.__file__).dirpath()
mod.tmpdir = py.test.ensuretemp(mod.__name__)
#def test_make_colitems():
# one = pkgdir.join("initpkg.py")
# two = pkgdir.join("path", "__init__.py")#
# cols = RSession.make_colitems([one, two], baseon=pkgdir)
# assert len(cols) == 2
# col_one, col_two = cols
# assert col_one.listnames() == ["py", "initpkg.py"]
# assert col_two.listnames() == ["py", "path", "__init__.py"]#
#
# cols = RSession.make_colitems([one, two], baseon=pkgdir.dirpath())
# assert len(cols) == 2
# col_one, col_two = cols
# assert col_one.listnames() == [pkgdir.dirpath().basename,
# "py", "initpkg.py"]
# assert col_two.listnames() == [pkgdir.dirpath().basename,
# "py", "path", "__init__.py"]
def test_example_tryiter(): def test_example_tryiter():
events = [] events = []
@ -50,15 +32,13 @@ def test_example_tryiter():
assert len(events) == 2 assert len(events) == 2
assert str(events[1][0].value) == "Reason" assert str(events[1][0].value) == "Reason"
class TestRSessionRemote: class TestRSessionRemote(DirSetup):
def test_example_distribution_minus_x(self): def test_example_distribution_minus_x(self):
destdir = py.test.ensuretemp("example_dist_dest_x") self.source.ensure("sub", "conftest.py").write(py.code.Source("""
tmpdir = py.test.ensuretemp("example_distribution_minus_x")
tmpdir.ensure("sub", "conftest.py").write(py.code.Source("""
dist_hosts = ['localhost:%s'] dist_hosts = ['localhost:%s']
""" % destdir)) """ % self.dest))
tmpdir.ensure("sub", "__init__.py") self.source.ensure("sub", "__init__.py")
tmpdir.ensure("sub", "test_one.py").write(py.code.Source(""" self.source.ensure("sub", "test_one.py").write(py.code.Source("""
def test_1(): def test_1():
pass pass
def test_x(): def test_x():
@ -71,7 +51,7 @@ class TestRSessionRemote:
def test_4(someargs): def test_4(someargs):
pass pass
""")) """))
config = py.test.config._reparse([tmpdir.join("sub"), '-x']) config = py.test.config._reparse([self.source.join("sub"), '-x'])
rsession = RSession(config) rsession = RSession(config)
allevents = [] allevents = []
rsession.main(reporter=allevents.append) rsession.main(reporter=allevents.append)
@ -139,7 +119,7 @@ class TestRSessionRemote:
hosts = [HostInfo('localhost')] hosts = [HostInfo('localhost')]
setup_events = [] setup_events = []
teardown_events = [] teardown_events = []
tmpdir = py.test.ensuretemp("emptyconftest")
config = py.test.config._reparse([tmpdir]) config = py.test.config._reparse([tmpdir])
hm = HostManager(hosts, config) hm = HostManager(hosts, config)
nodes = hm.init_hosts(setup_events.append) nodes = hm.init_hosts(setup_events.append)