##// END OF EJS Templates
Merge pull request #2046 from jstenar/iptest-unicode...
Min RK -
r7734:bb4488ab merge
parent child Browse files
Show More
@@ -53,6 +53,7 b' from nose import SkipTest'
53 from nose.core import TestProgram
53 from nose.core import TestProgram
54
54
55 # Our own imports
55 # Our own imports
56 from IPython.utils import py3compat
56 from IPython.utils.importstring import import_item
57 from IPython.utils.importstring import import_item
57 from IPython.utils.path import get_ipython_module_path, get_ipython_package_dir
58 from IPython.utils.path import get_ipython_module_path, get_ipython_package_dir
58 from IPython.utils.process import find_cmd, pycmd2argv
59 from IPython.utils.process import find_cmd, pycmd2argv
@@ -351,7 +352,7 b' class IPTester(object):'
351 raise ValueError("Section not found", self.params)
352 raise ValueError("Section not found", self.params)
352
353
353 if '--with-xunit' in self.call_args:
354 if '--with-xunit' in self.call_args:
354 self.call_args.append('--xunit-file=%s' % path.abspath(sect+'.xunit.xml'))
355 self.call_args.append('--xunit-file="%s"' % path.abspath(sect+'.xunit.xml'))
355
356
356 if '--with-xml-coverage' in self.call_args:
357 if '--with-xml-coverage' in self.call_args:
357 self.coverage_xml = path.abspath(sect+".coverage.xml")
358 self.coverage_xml = path.abspath(sect+".coverage.xml")
@@ -376,7 +377,9 b' class IPTester(object):'
376 # Enclose in quotes if necessary and legal
377 # Enclose in quotes if necessary and legal
377 if ' ' in arg and os.path.isfile(arg) and arg[0] != '"':
378 if ' ' in arg and os.path.isfile(arg) and arg[0] != '"':
378 self.call_args[ndx] = '"%s"' % arg
379 self.call_args[ndx] = '"%s"' % arg
379 return os.system(' '.join(self.call_args))
380 call_args = [py3compat.cast_unicode(x) for x in self.call_args]
381 cmd = py3compat.unicode_to_str(u' '.join(call_args))
382 return os.system(cmd)
380 else:
383 else:
381 def _run_cmd(self):
384 def _run_cmd(self):
382 # print >> sys.stderr, '*** CMD:', ' '.join(self.call_args) # dbg
385 # print >> sys.stderr, '*** CMD:', ' '.join(self.call_args) # dbg
@@ -543,7 +546,8 b' def run_iptestall():'
543 print '-'*40
546 print '-'*40
544 print 'Runner failed:',name
547 print 'Runner failed:',name
545 print 'You may wish to rerun this one individually, with:'
548 print 'You may wish to rerun this one individually, with:'
546 print ' '.join(failed_runner.call_args)
549 failed_call_args = [py3compat.cast_unicode(x) for x in failed_runner.call_args]
550 print u' '.join(failed_call_args)
547 print
551 print
548 # Ensure that our exit code indicates failure
552 # Ensure that our exit code indicates failure
549 sys.exit(1)
553 sys.exit(1)
General Comments 0
You need to be logged in to leave comments. Login now