summaryrefslogtreecommitdiff
path: root/machineout.py
diff options
context:
space:
mode:
Diffstat (limited to 'machineout.py')
-rw-r--r--machineout.py8
1 files changed, 2 insertions, 6 deletions
diff --git a/machineout.py b/machineout.py
index da51f0f..4a29c53 100644
--- a/machineout.py
+++ b/machineout.py
@@ -28,10 +28,6 @@ class NoseMachineReadableOutput(Plugin):
28 28
29 name = 'machineout' 29 name = 'machineout'
30 30
31 doctest_failure_re = re.compile(
32 'File "([^"]+)", line (\d+), in ([^\n]+)\n(.+)',
33 re.DOTALL)
34
35 def __init__(self): 31 def __init__(self):
36 super(NoseMachineReadableOutput, self).__init__() 32 super(NoseMachineReadableOutput, self).__init__()
37 self.basepath = os.getcwd() 33 self.basepath = os.getcwd()
@@ -69,7 +65,7 @@ class NoseMachineReadableOutput(Plugin):
69 lines = [line.strip('\n') for line in lines] 65 lines = [line.strip('\n') for line in lines]
70 msg = lines[0] 66 msg = lines[0]
71 67
72 fname = self.format_testfname(fname) 68 fname = self._format_testfname(fname)
73 prefix = "%s:%d" % (fname, lineno) 69 prefix = "%s:%d" % (fname, lineno)
74 self.stream.writeln("%s: In %s" % (fname, funname)) 70 self.stream.writeln("%s: In %s" % (fname, funname))
75 self.stream.writeln("%s: %s: %s" % (prefix, etype, msg)) 71 self.stream.writeln("%s: %s: %s" % (prefix, etype, msg))
@@ -79,7 +75,7 @@ class NoseMachineReadableOutput(Plugin):
79 for line in lines[1:]: 75 for line in lines[1:]:
80 self.stream.writeln("%s: %s %s" % (prefix, pad, line)) 76 self.stream.writeln("%s: %s %s" % (prefix, pad, line))
81 77
82 def format_testfname(self, fname): 78 def _format_testfname(self, fname):
83 if fname.startswith(self.basepath): 79 if fname.startswith(self.basepath):
84 return fname[len(self.basepath)+1:] 80 return fname[len(self.basepath)+1:]
85 81