[py-svn] r37110 - in py/branch/config/py/test: . rsession terminal tkinter tkinter/testing
hpk at codespeak.net
hpk at codespeak.net
Mon Jan 22 00:39:28 CET 2007
Author: hpk
Date: Mon Jan 22 00:39:24 2007
New Revision: 37110
Modified:
py/branch/config/py/test/config.py
py/branch/config/py/test/rsession/rsession.py
py/branch/config/py/test/rsession/slave.py
py/branch/config/py/test/terminal/remote.py
py/branch/config/py/test/tkinter/backend.py
py/branch/config/py/test/tkinter/testing/test_backend.py
py/branch/config/py/test/tkinter/testing/test_capture_out_err.py
Log:
renaming some variables for more clarity
Modified: py/branch/config/py/test/config.py
==============================================================================
--- py/branch/config/py/test/config.py (original)
+++ py/branch/config/py/test/config.py Mon Jan 22 00:39:24 2007
@@ -27,36 +27,36 @@
""" central hub for dealing with configuration/initialization data. """
Option = optparse.Option
conftest = Conftest()
+ _initialized = False
def __init__(self):
self.option = CmdOptions()
self._parser = optparse.OptionParser(
usage="usage: %prog [options] [query] [filenames of tests]")
- self._parsed = False
self._overwrite_dict = {}
def parse(self, args):
""" parse cmdline arguments into this config object.
Note that this can only be called once per testing process.
"""
- assert not self._parsed, (
+ assert not self._initialized, (
"can only parse cmdline args once per Config object")
- self._parsed = True
+ self._initialized = True
self.conftest.setinitial(args)
self.conftest.rget('adddefaultoptions')()
args = [str(x) for x in args]
- cmdlineoption, remaining = self._parser.parse_args(args)
+ cmdlineoption, args = self._parser.parse_args(args)
self.option.__dict__.update(vars(cmdlineoption))
fixoptions(self.option) # XXX fixing should be moved to sessions
- if not remaining:
- remaining.append(py.std.os.getcwd())
- self.remaining = remaining
+ if not args:
+ args.append(py.std.os.getcwd())
+ self.args = args
def getcolitems(self):
""" return initial collectors. """
colitems = []
- if self.remaining:
- for path in self.remaining:
+ if self.args:
+ for path in self.args:
path = py.path.local(path)
colitems.append(self._getcollector(path))
return colitems
Modified: py/branch/config/py/test/rsession/rsession.py
==============================================================================
--- py/branch/config/py/test/rsession/rsession.py (original)
+++ py/branch/config/py/test/rsession/rsession.py Mon Jan 22 00:39:24 2007
@@ -132,7 +132,7 @@
"""
def main(self, reporter=None):
""" main loop for running tests. """
- args = self.config.remaining
+ args = self.config.args
sshhosts, remotepython, rsync_roots = self.read_distributed_config()
reporter, startserverflag = self.init_reporter(reporter,
@@ -207,7 +207,7 @@
"""
def main(self, reporter=None, runner=None):
# check out if used options makes any sense
- args = self.config.remaining
+ args = self.config.args
sshhosts = [HostInfo('localhost')] # this is just an info to reporter
Modified: py/branch/config/py/test/rsession/slave.py
==============================================================================
--- py/branch/config/py/test/rsession/slave.py (original)
+++ py/branch/config/py/test/rsession/slave.py Mon Jan 22 00:39:24 2007
@@ -128,7 +128,7 @@
sys.path.insert(0, basedir)
import py
config = py.test.config
- if config._parsed:
+ if config._initialized:
config = config._reparse([basedir])
else:
config.conftest.setinitial([basedir])
Modified: py/branch/config/py/test/terminal/remote.py
==============================================================================
--- py/branch/config/py/test/terminal/remote.py (original)
+++ py/branch/config/py/test/terminal/remote.py Mon Jan 22 00:39:24 2007
@@ -88,7 +88,7 @@
self.executable = executable
def main(self):
- rootdir = getrootdir(self.config.remaining)
+ rootdir = getrootdir(self.config.args)
wasfailing = False
failures = []
while 1:
@@ -100,7 +100,7 @@
if not self.config.option.looponfailing:
break
print "#" * 60
- print "# looponfailing: mode: %d failures remaining" % len(failures)
+ print "# looponfailing: mode: %d failures args" % len(failures)
for root, names in failures:
name = "/".join(names) # XXX
print "Failure at: %r" % (name,)
@@ -117,7 +117,7 @@
""", stdout=self.out, stderr=self.out)
print "MASTER: triggered slave terminal session ->"
repr = self.config.make_repr(conftestnames=[])
- channel.send((repr, self.config.remaining, failures))
+ channel.send((repr, self.config.args, failures))
print "MASTER: send start info"
try:
return channel.receive()
@@ -131,7 +131,7 @@
repr, args, failures = channel.receive()
print "SLAVE: received configuration"
config = py.test.config
- config.remaining = args
+ config.args = args
config.conftest.setinitial(args)
config.merge_repr(repr)
config.option.looponfailing = False
Modified: py/branch/config/py/test/tkinter/backend.py
==============================================================================
--- py/branch/config/py/test/tkinter/backend.py (original)
+++ py/branch/config/py/test/tkinter/backend.py Mon Jan 22 00:39:24 2007
@@ -234,7 +234,7 @@
if tests:
cols = getfailureitems(tests)
else:
- cols = config.remaining
+ cols = config.args
session = ReportSession(config = config, channel=channel)
session.shouldclose = channel.isclosed
session.main()
Modified: py/branch/config/py/test/tkinter/testing/test_backend.py
==============================================================================
--- py/branch/config/py/test/tkinter/testing/test_backend.py (original)
+++ py/branch/config/py/test/tkinter/testing/test_backend.py Mon Jan 22 00:39:24 2007
@@ -180,7 +180,7 @@
def test_start_tests(self):
config = py.test.config._reparse([datadir/'filetest.py'])
self.backend.start_tests(config = config,
- args = config.remaining,
+ args = config.args,
tests = [])
while self.backend.running:
self.backend.update()
Modified: py/branch/config/py/test/tkinter/testing/test_capture_out_err.py
==============================================================================
--- py/branch/config/py/test/tkinter/testing/test_capture_out_err.py (original)
+++ py/branch/config/py/test/tkinter/testing/test_capture_out_err.py Mon Jan 22 00:39:24 2007
@@ -8,7 +8,7 @@
config = py.test.config._reparse([datadir/'filetest.py'])
backend = ReportBackend()
backend.start_tests(config = config,
- args = config.remaining,
+ args = config.args,
tests = [])
while backend.running:
backend.update()
More information about the pytest-commit
mailing list