Show More
@@ -135,6 +135,7 b' class TestController(object):' | |||||
135 |
|
135 | |||
136 | __del__ = cleanup |
|
136 | __del__ = cleanup | |
137 |
|
137 | |||
|
138 | ||||
138 | class PyTestController(TestController): |
|
139 | class PyTestController(TestController): | |
139 | """Run Python tests using IPython.testing.iptest""" |
|
140 | """Run Python tests using IPython.testing.iptest""" | |
140 | #: str, Python command to execute in subprocess |
|
141 | #: str, Python command to execute in subprocess | |
@@ -201,6 +202,7 b' class PyTestController(TestController):' | |||||
201 | self.cmd[2] = self.pycmd |
|
202 | self.cmd[2] = self.pycmd | |
202 | super(PyTestController, self).launch(buffer_output=buffer_output) |
|
203 | super(PyTestController, self).launch(buffer_output=buffer_output) | |
203 |
|
204 | |||
|
205 | ||||
204 | js_prefix = 'js/' |
|
206 | js_prefix = 'js/' | |
205 |
|
207 | |||
206 | def get_js_test_dir(): |
|
208 | def get_js_test_dir(): | |
@@ -222,7 +224,7 b' class JSController(TestController):' | |||||
222 | self.engine = engine |
|
224 | self.engine = engine | |
223 | self.section = section |
|
225 | self.section = section | |
224 | self.enabled = enabled |
|
226 | self.enabled = enabled | |
225 |
|
|
227 | self.slimer_failure = re.compile('^FAIL.*', flags=re.MULTILINE) | |
226 | js_test_dir = get_js_test_dir() |
|
228 | js_test_dir = get_js_test_dir() | |
227 | includes = '--includes=' + os.path.join(js_test_dir,'util.js') |
|
229 | includes = '--includes=' + os.path.join(js_test_dir,'util.js') | |
228 | test_cases = os.path.join(js_test_dir, self.section[len(js_prefix):]) |
|
230 | test_cases = os.path.join(js_test_dir, self.section[len(js_prefix):]) | |
@@ -264,7 +266,7 b' class JSController(TestController):' | |||||
264 | return self.slimer_failure.search(strip_ansi(stdout)) |
|
266 | return self.slimer_failure.search(strip_ansi(stdout)) | |
265 | else: |
|
267 | else: | |
266 | return ret |
|
268 | return ret | |
267 |
|
269 | |||
268 | def print_extra_info(self): |
|
270 | def print_extra_info(self): | |
269 | print("Running tests with notebook directory %r" % self.nbdir.name) |
|
271 | print("Running tests with notebook directory %r" % self.nbdir.name) | |
270 |
|
272 |
General Comments 0
You need to be logged in to leave comments.
Login now