jiuyuan
/
test_ok1
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[svn r38549] also privatizing Config.initdirect (which relates to remote reprs and such) 

--HG--
branch : trunk
This commit is contained in:
hpk 2007-02-12 13:21:16 +01:00
parent 5d36fbf365
commit d1008d3752
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
py/test/config.py
View File

@ -52,7 +52,7 @@ class Config(object):
self.topdir = gettopdir(args) self.topdir = gettopdir(args)
self.args = args self.args = args
def initdirect(self, topdir, repr, coltrails=None): def _initdirect(self, topdir, repr, coltrails=None):
assert not self._initialized assert not self._initialized
self._initialized = True self._initialized = True
self.topdir = py.path.local(topdir) self.topdir = py.path.local(topdir)

2
py/test/rsession/slave.py
View File

@ -90,7 +90,7 @@ def setup():
import py import py
config = py.test.config config = py.test.config
assert not config._initialized assert not config._initialized
config.initdirect(basedir, config_repr) config._initdirect(basedir, config_repr)
if hasattr(os, 'nice'): if hasattr(os, 'nice'):
nice_level = config.getvalue('dist_nicelevel') nice_level = config.getvalue('dist_nicelevel')
os.nice(nice_level) os.nice(nice_level)

2
py/test/terminal/remote.py
View File

@ -124,7 +124,7 @@ def slaverun_TerminalSession(channel):
topdir, repr, failures = channel.receive() topdir, repr, failures = channel.receive()
print "SLAVE: received configuration, using topdir:", topdir print "SLAVE: received configuration, using topdir:", topdir
config = py.test.config config = py.test.config
config.initdirect(topdir, repr, failures) config._initdirect(topdir, repr, failures)
config.option.session = None config.option.session = None
config.option.looponfailing = False config.option.looponfailing = False
config.option.usepdb = False config.option.usepdb = False

8
py/test/testing/test_config.py
View File

@ -123,7 +123,7 @@ def test_gettopdir_pypkg():
def test_config_init_direct(): def test_config_init_direct():
tmp = py.test.ensuretemp("initdirect") tmp = py.test.ensuretemp("_initdirect")
tmp.ensure("__init__.py") tmp.ensure("__init__.py")
tmp.ensure("conftest.py").write("x=1 ; y=2") tmp.ensure("conftest.py").write("x=1 ; y=2")
hello = tmp.ensure("test_hello.py") hello = tmp.ensure("test_hello.py")
@ -131,13 +131,13 @@ def test_config_init_direct():
repr = config._makerepr(conftestnames=['x', 'y']) repr = config._makerepr(conftestnames=['x', 'y'])
config2 = py.test.config._reparse([tmp.dirpath()]) config2 = py.test.config._reparse([tmp.dirpath()])
config2._initialized = False # we have to do that from tests config2._initialized = False # we have to do that from tests
config2.initdirect(topdir=tmp.dirpath(), repr=repr) config2._initdirect(topdir=tmp.dirpath(), repr=repr)
for col1, col2 in zip(config.getcolitems(), config2.getcolitems()): for col1, col2 in zip(config.getcolitems(), config2.getcolitems()):
assert col1.fspath == col2.fspath assert col1.fspath == col2.fspath
py.test.raises(AssertionError, "config2.initdirect(None, None)") py.test.raises(AssertionError, "config2._initdirect(None, None)")
from py.__.test.config import Config from py.__.test.config import Config
config3 = Config() config3 = Config()
config3.initdirect(topdir=tmp.dirpath(), repr=repr, config3._initdirect(topdir=tmp.dirpath(), repr=repr,
coltrails=[(tmp.basename, (hello.basename,))]) coltrails=[(tmp.basename, (hello.basename,))])
assert config3.getvalue('x') == 1 assert config3.getvalue('x') == 1
assert config3.getvalue('y') == 2 assert config3.getvalue('y') == 2