diff options
| author | Ned Batchelder <ned@nedbatchelder.com> | 2011-07-04 13:53:18 -0400 |
|---|---|---|
| committer | Ned Batchelder <ned@nedbatchelder.com> | 2011-07-04 13:53:18 -0400 |
| commit | 91692c31f757fe78e9a7376033f66772fc97f36b (patch) | |
| tree | 53484cc5af1c35ab2588ecf104984ac0c109ad48 | |
| parent | 9a57b96e1688fba3038b86a2f2c8244167db158f (diff) | |
| download | python-coveragepy-git-91692c31f757fe78e9a7376033f66772fc97f36b.tar.gz | |
for-else constructs are handled properly, avoiding bogus partial branch warnings. Fixes issue #122. Bonus irony: this also makes while 1 loops automatically understood better too.
| -rw-r--r-- | CHANGES.txt | 4 | ||||
| -rw-r--r-- | test/farm/html/run_b_branch.py | 6 | ||||
| -rw-r--r-- | test/farm/html/src/b.py | 19 | ||||
| -rw-r--r-- | test/test_arcs.py | 4 |
4 files changed, 19 insertions, 14 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index 03c310d2..71aa26d3 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -5,6 +5,10 @@ Change history for Coverage.py Version 3.5.1 ------------- +- for-else constructs are understood better, and don't cause erroneous partial + branch warnings. Fixes `issue 122`_. + +.. _issue 122: http://bitbucket.org/ned/coveragepy/issue/122/for-else-always-reports-missing-branch Version 3.5 --- 29 June 2011 diff --git a/test/farm/html/run_b_branch.py b/test/farm/html/run_b_branch.py index f129e436..31543398 100644 --- a/test/farm/html/run_b_branch.py +++ b/test/farm/html/run_b_branch.py @@ -15,14 +15,14 @@ compare("gold_b_branch", "html_b_branch", size_within=10, file_pattern="*.html") contains("html_b_branch/b.html", "<span class='key'>if</span> <span class='nam'>x</span> <span class='op'><</span> <span class='num'>2</span>", " <span class='nam'>a</span> <span class='op'>=</span> <span class='num'>3</span>", - "<span class='pc_cov'>76%</span>", + "<span class='pc_cov'>70%</span>", "<span class='annotate' title='no jump to this line number'>8</span>", "<span class='annotate' title='no jump to this line number'>exit</span>", - "<span class='annotate' title='no jumps to these line numbers'>25 26</span>", + "<span class='annotate' title='no jumps to these line numbers'>23 25</span>", ) contains("html_b_branch/index.html", "<a href='b.html'>b</a>", - "<span class='pc_cov'>76%</span>" + "<span class='pc_cov'>70%</span>" ) clean("html_b_branch") diff --git a/test/farm/html/src/b.py b/test/farm/html/src/b.py index dffdd50f..3bf73a9f 100644 --- a/test/farm/html/src/b.py +++ b/test/farm/html/src/b.py @@ -16,13 +16,14 @@ def two(x): two(1) -def three_way(): - # for-else can be a three-way branch. - for i in range(10): - if i == 3: - break - else: - return 23 - return 17 +def three(): + try: + # This if has two branches, *neither* one taken. + if name_error_this_variable_doesnt_exist: + a = 1 + else: + a = 2 + except: + pass -three_way() +three() diff --git a/test/test_arcs.py b/test/test_arcs.py index 9f86ecde..2c983170 100644 --- a/test/test_arcs.py +++ b/test/test_arcs.py @@ -213,12 +213,12 @@ class LoopArcTest(CoverageTest): i += 1 assert a == 4 and i == 3 """, - arcz=".1 12 23 27 34 45 36 63 57 7.", + arcz=".1 12 23 34 45 36 63 57 7.", ) # With "while True", 2.x thinks it's computation, 3.x thinks it's # constant. if sys.version_info >= (3, 0): - arcz = ".1 12 23 27 34 45 36 63 57 7." + arcz = ".1 12 23 34 45 36 63 57 7." else: arcz = ".1 12 23 27 34 45 36 62 57 7." self.check_coverage("""\ |