##// END OF EJS Templates
Merge pull request #11784 from Carreau/clean-iptest...
Matthias Bussonnier -
r25088:5cb4865e merge
parent child Browse files
Show More
@@ -28,7 +28,7 b' from IPython.utils.py3compat import decode'
28 from IPython.utils.sysinfo import get_sys_info
28 from IPython.utils.sysinfo import get_sys_info
29 from IPython.utils.tempdir import TemporaryDirectory
29 from IPython.utils.tempdir import TemporaryDirectory
30
30
31 class TestController(object):
31 class TestController:
32 """Run tests in a subprocess
32 """Run tests in a subprocess
33 """
33 """
34 #: str, IPython test suite to be executed.
34 #: str, IPython test suite to be executed.
@@ -77,18 +77,6 b' class TestController(object):'
77 self.stdout = self.stdout_capturer.get_buffer()
77 self.stdout = self.stdout_capturer.get_buffer()
78 return self.process.returncode
78 return self.process.returncode
79
79
80 def print_extra_info(self):
81 """Print extra information about this test run.
82
83 If we're running in parallel and showing the concise view, this is only
84 called if the test group fails. Otherwise, it's called before the test
85 group is started.
86
87 The base implementation does nothing, but it can be overridden by
88 subclasses.
89 """
90 return
91
92 def cleanup_process(self):
80 def cleanup_process(self):
93 """Cleanup on exit by killing any leftover processes."""
81 """Cleanup on exit by killing any leftover processes."""
94 subp = self.process
82 subp = self.process
@@ -243,8 +231,6 b' def do_run(controller, buffer_output=True):'
243 try:
231 try:
244 try:
232 try:
245 controller.setup()
233 controller.setup()
246 if not buffer_output:
247 controller.print_extra_info()
248 controller.launch(buffer_output=buffer_output)
234 controller.launch(buffer_output=buffer_output)
249 except Exception:
235 except Exception:
250 import traceback
236 import traceback
@@ -367,7 +353,6 b' def run_iptestall(options):'
367 res_string = 'OK' if res == 0 else 'FAILED'
353 res_string = 'OK' if res == 0 else 'FAILED'
368 print(justify('Test group: ' + controller.section, res_string))
354 print(justify('Test group: ' + controller.section, res_string))
369 if res:
355 if res:
370 controller.print_extra_info()
371 print(decode(controller.stdout))
356 print(decode(controller.stdout))
372 failed.append(controller)
357 failed.append(controller)
373 if res == -signal.SIGINT:
358 if res == -signal.SIGINT:
General Comments 0
You need to be logged in to leave comments. Login now