[pypy-commit] pypy refine-testrunner: experimentally resuffle where test configs are
RonnyPfannschmidt
noreply at buildbot.pypy.org
Sat Sep 15 20:08:28 CEST 2012
Author: Ronny Pfannschmidt <Ronny.Pfannschmidt at gmx.de>
Branch: refine-testrunner
Changeset: r57357:5aeefcf5e3fb
Date: 2012-09-15 18:12 +0200
http://bitbucket.org/pypy/pypy/changeset/5aeefcf5e3fb/
Log: experimentally resuffle where test configs are
diff --git a/pypy/pytest-A.cfg b/testrunner/apptests.cfg
rename from pypy/pytest-A.cfg
rename to testrunner/apptests.cfg
diff --git a/pypy/testrunner_cfg.py b/testrunner/owntests.cfg
rename from pypy/testrunner_cfg.py
rename to testrunner/owntests.cfg
diff --git a/testrunner/runner.py b/testrunner/runner.py
--- a/testrunner/runner.py
+++ b/testrunner/runner.py
@@ -217,6 +217,12 @@
self.collect_testdirs(testdirs, p1)
+renamed_configs = {
+ 'pypy/pytest-A.cfg': 'testrunner/apptests.cfg',
+ 'pypy/testrunner_cfg.py': 'testrunner/owntests.cfg',
+}
+
+
def main(opts, args, RunParamClass):
@@ -238,6 +244,7 @@
# in that code function overriding method should not take self
# though a self and self.__class__ are available if needed
for config_py_file in opts.config:
+ config_py_file = renamed_configs.get(config_py_file, config_py_file)
config_py_file = os.path.expanduser(config_py_file)
if py.path.local(config_py_file).check(file=1):
run_param.log("using config %s", config_py_file)
More information about the pypy-commit
mailing list