A cleaner way to exclude Jython concerns from meta-coverage.

6 files changed, 8 insertions, 6 deletions

diff --git a/metacov.ini b/metacov.ini
index a16c6d66..23806587 100644
--- a/metacov.ini
+++ b/metacov.ini
@@ -20,11 +20,13 @@ exclude_lines =
     pragma: debugging
     pragma: only failure
     pragma: only jython
+    skip.*Jython
 
 partial_branches =
     pragma: part covered
     pragma: if failure
     if env.TESTING:
+    if .* env.JYTHON
 
 ignore_errors = true
 precision = 1
diff --git a/tests/test_arcs.py b/tests/test_arcs.py
index efd8d706..505cab73 100644
--- a/tests/test_arcs.py
+++ b/tests/test_arcs.py
@@ -1102,7 +1102,7 @@ class MiscArcTest(CoverageTest):
 
     def test_pathologically_long_code_object(self):
         if env.JYTHON:
-            self.skipTest("Bytecode concerns are irrelevant on Jython")     # pragma: only jython
+            self.skipTest("Bytecode concerns are irrelevant on Jython")
 
         # https://bitbucket.org/ned/coveragepy/issue/359
         # The structure of this file is such that an EXTENDED_ARG bytecode is
diff --git a/tests/test_execfile.py b/tests/test_execfile.py
index 6973022a..92bd26d9 100644
--- a/tests/test_execfile.py
+++ b/tests/test_execfile.py
@@ -104,7 +104,7 @@ class RunPycFileTest(CoverageTest):
     def make_pyc(self):
         """Create a .pyc file, and return the relative path to it."""
         if env.JYTHON:
-            self.skipTest("Can't make .pyc files on Jython")    # pragma: only jython
+            self.skipTest("Can't make .pyc files on Jython")
 
         self.make_file("compiled.py", """\
             def doit():
diff --git a/tests/test_farm.py b/tests/test_farm.py
index f9b79a23..4a80be47 100644
--- a/tests/test_farm.py
+++ b/tests/test_farm.py
@@ -31,7 +31,7 @@ TEST_FILES = glob.glob("tests/farm/*/*.py")
 def test_farm(filename):
     if env.JYTHON:
         # All of the farm tests use reporting, so skip them all.
-        skip("Farm tests don't run on Jython")      # pragma: only jython
+        skip("Farm tests don't run on Jython")
     FarmTestCase(filename).run_fully()
 
 
diff --git a/tests/test_oddball.py b/tests/test_oddball.py
index 98eee1bc..d55fb440 100644
--- a/tests/test_oddball.py
+++ b/tests/test_oddball.py
@@ -145,7 +145,7 @@ class MemoryLeakTest(CoverageTest):
     """
     def test_for_leaks(self):
         if env.JYTHON:
-            self.skipTest("Don't bother on Jython")             # pragma: only jython
+            self.skipTest("Don't bother on Jython")
 
         # Our original bad memory leak only happened on line numbers > 255, so
         # make a code object with more lines than that.  Ugly string mumbo
diff --git a/tests/test_process.py b/tests/test_process.py
index 6ed566e4..debd0d79 100644
--- a/tests/test_process.py
+++ b/tests/test_process.py
@@ -891,7 +891,7 @@ class AliasedCommandTest(CoverageTest):
     def setUp(self):
         super(AliasedCommandTest, self).setUp()
         if env.JYTHON:
-            self.skipTest("Coverage command names don't work on Jython")    # pragma: only jython
+            self.skipTest("Coverage command names don't work on Jython")
 
     def test_major_version_works(self):
         # "coverage2" works on py2
@@ -1095,7 +1095,7 @@ class UnicodeFilePathsTest(CoverageTest):
     def setUp(self):
         super(UnicodeFilePathsTest, self).setUp()
         if env.JYTHON:
-            self.skipTest("Jython 2 doesn't like accented file names")      # pragma: only 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.