Merge pull request #2046 from jstenar/iptest-unicode

iptest unicode

- fix space in path issue for iptest when using --with-xunit
- fix unicode issue in path for iptest

closes #760
This commit is contained in:
Min RK 2012-06-27 15:16:30 -07:00
commit b8d1bbffaa

View File

@ -53,6 +53,7 @@ from nose import SkipTest
from nose.core import TestProgram
# Our own imports
from IPython.utils import py3compat
from IPython.utils.importstring import import_item
from IPython.utils.path import get_ipython_module_path, get_ipython_package_dir
from IPython.utils.process import find_cmd, pycmd2argv
@ -351,7 +352,7 @@ class IPTester(object):
raise ValueError("Section not found", self.params)
if '--with-xunit' in self.call_args:
self.call_args.append('--xunit-file=%s' % path.abspath(sect+'.xunit.xml'))
self.call_args.append('--xunit-file="%s"' % path.abspath(sect+'.xunit.xml'))
if '--with-xml-coverage' in self.call_args:
self.coverage_xml = path.abspath(sect+".coverage.xml")
@ -376,7 +377,9 @@ class IPTester(object):
# Enclose in quotes if necessary and legal
if ' ' in arg and os.path.isfile(arg) and arg[0] != '"':
self.call_args[ndx] = '"%s"' % arg
return os.system(' '.join(self.call_args))
call_args = [py3compat.cast_unicode(x) for x in self.call_args]
cmd = py3compat.unicode_to_str(u' '.join(call_args))
return os.system(cmd)
else:
def _run_cmd(self):
# print >> sys.stderr, '*** CMD:', ' '.join(self.call_args) # dbg
@ -543,7 +546,8 @@ def run_iptestall():
print '-'*40
print 'Runner failed:',name
print 'You may wish to rerun this one individually, with:'
print ' '.join(failed_runner.call_args)
failed_call_args = [py3compat.cast_unicode(x) for x in failed_runner.call_args]
print u' '.join(failed_call_args)
print
# Ensure that our exit code indicates failure
sys.exit(1)