diff options
| -rw-r--r-- | coverage/parser.py | 4 | ||||
| -rw-r--r-- | tests/test_arcs.py | 24 | ||||
| -rw-r--r-- | tests/test_coverage.py | 3 |
3 files changed, 15 insertions, 16 deletions
diff --git a/coverage/parser.py b/coverage/parser.py index 1e307c41..9c7a8d1e 100644 --- a/coverage/parser.py +++ b/coverage/parser.py @@ -338,9 +338,7 @@ class PythonParser(object): fragment_pairs = self._missing_arc_fragments.get((start, end), [(None, None)]) msgs = [] - for fragment_pair in fragment_pairs: - smsg, emsg = fragment_pair - + for smsg, emsg in fragment_pairs: if emsg is None: if end < 0: # Hmm, maybe we have a one-line callable, let's check. diff --git a/tests/test_arcs.py b/tests/test_arcs.py index fb958a66..f3aa8ebb 100644 --- a/tests/test_arcs.py +++ b/tests/test_arcs.py @@ -5,7 +5,7 @@ import pytest -from tests.coveragetest import CoverageTest, xfail +from tests.coveragetest import CoverageTest import coverage from coverage import env @@ -1278,24 +1278,26 @@ class OptimizedIfTest(CoverageTest): arcz_missing=arcz_missing, ) - @xfail(env.PYBEHAVIOR.pep626, reason="https://bugs.python.org/issue42803") def test_if_not_debug(self): - if env.PYBEHAVIOR.optimize_if_not_debug2: - arcz = ".1 12 24 41 26 61 1." - arcz_missing = "" + arcz_missing = "" + if env.PYBEHAVIOR.pep626: + arcz = ".1 12 23 34 42 37 72 28 8." + elif env.PYBEHAVIOR.optimize_if_not_debug2: + arcz = ".1 12 23 35 52 37 72 28 8." elif env.PYBEHAVIOR.optimize_if_not_debug: - arcz = ".1 12 23 31 26 61 1." - arcz_missing = "" + arcz = ".1 12 23 34 42 37 72 28 8." else: - arcz = ".1 12 23 31 34 41 26 61 1." - arcz_missing = "34 41" + arcz = ".1 12 23 34 45 42 52 37 72 28 8." + arcz_missing = "45 52" self.check_coverage("""\ + lines = set() for value in [True, False]: if value: if not __debug__: - x = 4 + lines.add(5) else: - x = 6 + lines.add(7) + assert lines == set([7]) """, arcz=arcz, arcz_missing=arcz_missing, diff --git a/tests/test_coverage.py b/tests/test_coverage.py index a6c8f492..68eea115 100644 --- a/tests/test_coverage.py +++ b/tests/test_coverage.py @@ -8,7 +8,7 @@ import coverage from coverage import env from coverage.misc import CoverageException -from tests.coveragetest import CoverageTest, xfail +from tests.coveragetest import CoverageTest class TestCoverageTest(CoverageTest): @@ -679,7 +679,6 @@ class CompoundStatementTest(CoverageTest): """, [1,2,3,5], "") - @xfail(env.PYBEHAVIOR.pep626, reason="pep626: https://bugs.python.org/issue42810") def test_if(self): self.check_coverage("""\ a = 1 |