Author: Ronny Pfannschmidt <ronny.pfannschm...@gmx.de>
Branch: refine-testrunner
Changeset: r61607:6e6b7860748d
Date: 2013-02-22 14:19 +0100
http://bitbucket.org/pypy/pypy/changeset/6e6b7860748d/
Log: some whitespace fixes
diff --git a/testrunner/runner.py b/testrunner/runner.py
--- a/testrunner/runner.py
+++ b/testrunner/runner.py
@@ -151,7 +151,7 @@
test_driver = [pytestpath]
cherrypick = None
-
+
def __init__(self, root, out):
self.root = root
self.out = out
@@ -160,7 +160,7 @@
self.parallel_runs = 1
self.timeout = None
self.cherrypick = None
-
+
@classmethod
def from_options(cls, opts, out):
root = py.path.local(opts.root)
@@ -176,7 +176,6 @@
self.runfunc = self.run
return self
-
def log(self, fmt, *args):
self.out.write((fmt % args) + '\n')
@@ -199,7 +198,7 @@
def collect_testdirs(self, testdirs, p=None):
if p is None:
p = self.root
-
+
reldir = self.reltoroot(p)
entries = [p1 for p1 in p.listdir() if p1.check(dotfile=0)]
entries.sort()
diff --git a/testrunner/test/test_runner.py b/testrunner/test/test_runner.py
--- a/testrunner/test/test_runner.py
+++ b/testrunner/test/test_runner.py
@@ -22,7 +22,6 @@
def pytest_funcarg__fakerun(self, request):
return FakeRun()
-
def test_explicit(self, fakerun):
res = runner.execute_test('/wd', 'test_one', 'out', 'LOGFILE',
runfunc=fakerun,
@@ -38,7 +37,7 @@
'test_one']
- assert fakerun.called == (expected, '/wd', 'out', 'secs')
+ assert fakerun.called == (expected, '/wd', 'out', 'secs')
assert res == 0
def test_explicit_win32(self, fakerun):
@@ -64,7 +63,6 @@
test_driver=['driver', 'darg'])
assert res == 1
-
fakerun.exitcode = -signal.SIGSEGV
res = runner.execute_test('/wd', 'test_one', 'out', 'LOGFILE',
runfunc=fakerun,
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
