From 6976532ec54329d6e1eda38bc433deeee953391a 2014-06-04 20:15:55 From: Jonathan Frederic Date: 2014-06-04 20:15:55 Subject: [PATCH] Fixed spaces in ipcontroller --- diff --git a/IPython/testing/iptestcontroller.py b/IPython/testing/iptestcontroller.py index e7dbadc..c5056b3 100644 --- a/IPython/testing/iptestcontroller.py +++ b/IPython/testing/iptestcontroller.py @@ -135,6 +135,7 @@ class TestController(object): __del__ = cleanup + class PyTestController(TestController): """Run Python tests using IPython.testing.iptest""" #: str, Python command to execute in subprocess @@ -201,6 +202,7 @@ class PyTestController(TestController): self.cmd[2] = self.pycmd super(PyTestController, self).launch(buffer_output=buffer_output) + js_prefix = 'js/' def get_js_test_dir(): @@ -222,7 +224,7 @@ class JSController(TestController): self.engine = engine self.section = section self.enabled = enabled - self.slimer_failure = re.compile('^FAIL.*', flags=re.MULTILINE) + self.slimer_failure = re.compile('^FAIL.*', flags=re.MULTILINE) js_test_dir = get_js_test_dir() includes = '--includes=' + os.path.join(js_test_dir,'util.js') test_cases = os.path.join(js_test_dir, self.section[len(js_prefix):]) @@ -264,7 +266,7 @@ class JSController(TestController): return self.slimer_failure.search(strip_ansi(stdout)) else: return ret - + def print_extra_info(self): print("Running tests with notebook directory %r" % self.nbdir.name)