summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNed Batchelder <ned@nedbatchelder.com>2017-01-14 14:33:11 -0500
committerNed Batchelder <ned@nedbatchelder.com>2017-01-14 14:33:11 -0500
commit556f1ddd93c69c5328d65350f0844f35e2d191ff (patch)
treeed51b86f1bb56218df16d7102e43b3ae67e901c9
parent3601062a2fee1d2c15810145121e2319ba1a557f (diff)
downloadpython-coveragepy-git-556f1ddd93c69c5328d65350f0844f35e2d191ff.tar.gz
Excepthook and Unicode path tests need some Jython care
-rw-r--r--tests/test_process.py19
1 files changed, 13 insertions, 6 deletions
diff --git a/tests/test_process.py b/tests/test_process.py
index e5584ae2..0182fa26 100644
--- a/tests/test_process.py
+++ b/tests/test_process.py
@@ -821,8 +821,9 @@ class ExcepthookTest(CoverageTest):
""")
cov_st, cov_out = self.run_command_status("coverage run excepthook.py")
py_st, py_out = self.run_command_status("python excepthook.py")
- self.assertEqual(cov_st, py_st)
- self.assertEqual(cov_st, 1)
+ if not env.JYTHON:
+ self.assertEqual(cov_st, py_st)
+ self.assertEqual(cov_st, 1)
self.assertIn("in excepthook", py_out)
self.assertEqual(cov_out, py_out)
@@ -834,8 +835,8 @@ class ExcepthookTest(CoverageTest):
self.assertEqual(data.line_counts()['excepthook.py'], 7)
def test_excepthook_exit(self):
- if env.PYPY:
- self.skipTest("PyPy handles excepthook exits differently, punt for now.")
+ if env.PYPY or env.JYTHON:
+ self.skipTest("non-CPython handles excepthook exits differently, punt for now.")
self.make_file("excepthook_exit.py", """\
import sys
@@ -874,8 +875,9 @@ class ExcepthookTest(CoverageTest):
""")
cov_st, cov_out = self.run_command_status("coverage run excepthook_throw.py")
py_st, py_out = self.run_command_status("python excepthook_throw.py")
- self.assertEqual(cov_st, py_st)
- self.assertEqual(cov_st, 1)
+ if not env.JYTHON:
+ self.assertEqual(cov_st, py_st)
+ self.assertEqual(cov_st, 1)
self.assertIn("in excepthook", py_out)
self.assertEqual(cov_out, py_out)
@@ -1090,6 +1092,11 @@ class FailUnder100Test(CoverageTest):
class UnicodeFilePathsTest(CoverageTest):
"""Tests of using non-ascii characters in the names of files."""
+ def setUp(self):
+ super(UnicodeFilePathsTest, self).setUp()
+ if env.JYTHON:
+ self.skipTest("Jython 2 doesn't like accented file names")
+
def test_accented_dot_py(self):
# Make a file with a non-ascii character in the filename.
self.make_file(u"h\xe2t.py", "print('accented')")