Unroll calls to any #5062 #5103

Tadaboody · 2019-04-13T16:17:45Z

Create a new changelog file in the changelog folder, with a name like <ISSUE NUMBER>.<TYPE>.rst. See changelog/README.rst for details.
Target the master branch for bug fixes, documentation updates and trivial changes.
Target the features branch for new features and removals/deprecations.
Include documentation when adding new features.
Include new tests or update existing tests when applicable.

Tadaboody · 2019-04-13T16:19:33Z

Current roadblock - I want to recursively rewrite the assert inside the for loop, but visit_Assert resets the state so I can't call self.visit(assert_node). On the other hand, I want to stay consistent with things like variable names so I don't want to create a new AssertionVisitor

codecov · 2019-04-13T17:12:27Z

Codecov Report

Merging #5103 into features will increase coverage by 1.78%.
The diff coverage is 90%.

@@             Coverage Diff              @@
##           features    #5103      +/-   ##
============================================
+ Coverage     91.48%   93.27%   +1.78%     
============================================
  Files           115      115              
  Lines         26179    26194      +15     
  Branches       2582     2582              
============================================
+ Hits          23951    24433     +482     
+ Misses         1904     1445     -459     
+ Partials        324      316       -8

Impacted Files	Coverage Δ
src/_pytest/assertion/rewrite.py	`95.25% <85.71%> (-0.23%)`	⬇️
testing/test_assertrewrite.py	`84.28% <93.75%> (+0.22%)`	⬆️
testing/python/collect.py	`82.94% <0%> (-16.21%)`	⬇️
testing/python/metafunc.py	`89.15% <0%> (-4.42%)`	⬇️
testing/test_tmpdir.py	`97.31% <0%> (-1.62%)`	⬇️
src/_pytest/compat.py	`95.97% <0%> (-1.01%)`	⬇️
src/_pytest/helpconfig.py	`97.32% <0%> (-0.26%)`	⬇️
testing/test_skipping.py	`97.47% <0%> (-0.03%)`	⬇️
testing/test_assertion.py	`97.67% <0%> (-0.01%)`	⬇️
testing/test_pdb.py	`98.82% <0%> (ø)`	⬆️
... and 17 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 10ca84f...22d91a3. Read the comment docs.

Tadaboody · 2019-04-13T17:53:21Z

Ok it's at a point where it shows a better report but not quite detailed enough, would like a proposition on where to take it from here

test_example.py F                                                        [100%]

=================================== FAILURES ===================================
_________________________________ test_rolled __________________________________

    def test_rolled():
>       assert all(x == 1 for x in range(10))
E       assert 0 == 1

test_example.py:2: AssertionError

The rewritten ast is exactly as expected, just as if it was a for loop:

=========================== Rewritten AST as Python ============================
import builtins as @py_builtins
import _pytest.assertion.rewrite as @pytest_ar

def test_rolled():
    for x in range(10):
        import builtins as @py_builtins
        import _pytest.assertion.rewrite as @pytest_ar
        @py_assert2 = 1
        @py_assert1 = x == @py_assert2
        if not @py_assert1:
            @py_format4 = @pytest_ar._call_reprcompare(('==',), (@py_assert1,), ('%(py0)s == %(py3)s',), (x, @py_assert2)) % {'py0': @pytest_ar._saferepr(x) if 'x' in @py_builtins.locals() or @pytest_ar._should_repr_global_name(x) else 'x', 'py3': @pytest_ar._saferepr(@py_assert2)}
            @py_format6 = ('' + 'assert %(py5)s') % {'py5': @py_format4}
            raise AssertionError(@pytest_ar._format_explanation(@py_format6))
        @py_assert1 = @py_assert2 = None
    if 1 is None:
        from _pytest.warning_types import PytestWarning
        from warnings import warn_explicit
        warn_explicit(PytestWarning('asserting the value None, please use "assert is None"'), category=None, filename='/Users/me/Forks/pytest/test_example.py', lineno=2)
    if not 1:
        @py_format0 = ('' + 'assert ') % {}
        raise AssertionError(@pytest_ar._format_explanation(@py_format0))
=========================== short test summary info ============================
FAILED test_example.py::test_rolled
=========================== 1 failed in 0.10 seconds ===========================

Tadaboody · 2019-04-13T17:58:59Z

I'm not going to be able to continue this until next week - @danielx123 if you want to fork this until then you're more than welcome!

Stranger6667 · 2019-04-13T21:30:14Z

src/_pytest/assertion/rewrite.py

@@ -987,6 +989,27 @@ def visit_Call_35(self, call):
        outer_expl = "%s\n{%s = %s\n}" % (res_expl, res_expl, expl)
        return res, outer_expl

+    def visit_all(self, call):
+        """Special rewrite for the builtin all function, see #5602"""


Seems like it should be #5062 instead of #5602

danielx123 · 2019-04-17T23:22:44Z

@Tadaboody I can work on this during the weekend. How do you want to work on this together?

Tadaboody · 2019-05-09T16:16:30Z

Alright I think this is pretty stable and does what it's supposed to. @nicoddemus I'll be waiting to start a review process

nicoddemus

Hi @Tadaboody,

Great job!

Here's what we get on master with your samples:

============================= FAILURES ==============================
__________________________ test_generator ___________________________

    def test_generator():
        odd_list = list(range(1,9,2))
>       assert all(check_even(num) for num in odd_list)
E       assert False
E        +  where False = all(<generator object test_generator.<locals>.<genexpr> at 0x000001D7A54FA678>)

.tmp\test-foo.py:8: AssertionError
______________________ test_list_comprehension ______________________

    def test_list_comprehension():
        odd_list = list(range(1,9,2))
>       assert all([check_even(num) for num in odd_list])
E       assert False
E        +  where False = all([False, False, False, False])

.tmp\test-foo.py:13: AssertionError
___________________________ test_for_loop ___________________________

    def test_for_loop():
        odd_list = list(range(1,9,2))
        for num in odd_list:
>           assert check_even(num)
E           assert False
E            +  where False = check_even(1)

.tmp\test-foo.py:19: AssertionError
===================== 3 failed in 0.11 seconds ======================

And with your branch:

============================= FAILURES ==============================
__________________________ test_generator ___________________________

    def test_generator():
        odd_list = list(range(1,9,2))
>       assert all(check_even(num) for num in odd_list)
E       assert False
E        +  where False = check_even(1)

.tmp\test-foo.py:8: AssertionError
______________________ test_list_comprehension ______________________

    def test_list_comprehension():
        odd_list = list(range(1,9,2))
>       assert all([check_even(num) for num in odd_list])
E       assert False
E        +  where False = check_even(1)

.tmp\test-foo.py:13: AssertionError
___________________________ test_for_loop ___________________________

    def test_for_loop():
        odd_list = list(range(1,9,2))
        for num in odd_list:
>           assert check_even(num)
E           assert False
E            +  where False = check_even(1)

.tmp\test-foo.py:19: AssertionError
===================== 3 failed in 0.10 seconds ======================

nicoddemus · 2019-05-18T16:01:40Z

Do you mind rebasing on features and pushing again? codecov is providing some funny results.

…nrolled for loop

This reverts commit 043fdb7. These tests were part of the PR #5155 but weren't relevant to #5602

…ting The code ``` x = 0 assert x == 1 ``` will give the failure message 0 == 1, so it shouldn't be different as part of an unroll

Tadaboody · 2019-05-25T17:11:42Z

rebased

nicoddemus · 2019-05-27T23:17:40Z

Merging as the failure is unrelated: #5317

nicoddemus · 2019-05-27T23:19:30Z

Thanks @Tadaboody!

This reverts commit 2b9ca34, reversing changes made to 0a57124.

blueyed · 2019-05-29T22:12:51Z

@nicoddemus

Merging as the failure is unrelated: #5317

It turns out that it is not really it seems.. ;)

nicoddemus · 2019-05-29T23:16:08Z

😮

Tadaboody added the status: help wanted developers would like help from experts on this topic label Apr 13, 2019

Tadaboody changed the title ~~WIP: Unroll all any 5062~~ WIP: Unroll calls to any #5062 Apr 13, 2019

Stranger6667 reviewed Apr 13, 2019

View reviewed changes

danielx123 mentioned this pull request Apr 22, 2019

Adding test cases for unrolling an iterable #5062 #5155

Closed

Tadaboody changed the title ~~WIP: Unroll calls to any #5062~~ Unroll calls to any #5062 May 9, 2019

Tadaboody removed the status: help wanted developers would like help from experts on this topic label May 9, 2019

nicoddemus approved these changes May 18, 2019

View reviewed changes

Tadaboody and others added 14 commits May 25, 2019 19:34

Sanity tests for loop unrolling

6b5152a

Replace asserts of any with an assert in a for

765f75a

Rewrite unrolled assertion with a new rewriter,correctly append the u…

470e686

…nrolled for loop

Add changelog entry for 5062

ddbe733

Adding test cases for unrolling an iterable #5062

a0dbf2a

Displaying pip list command's packages and versions #5062

0996f3d

Fixed test case

c607697

Revert "Displaying pip list command's packages and versions #5062"

ecd2de2

This reverts commit 043fdb7. These tests were part of the PR #5155 but weren't relevant to #5602

Check calls to all only if it's a name and not an attribute

e37ff30

Expand list comprehensions as well

437d645

Change basic test case to be consistent with existing assertion rewri…

852fb6a

…ting The code ``` x = 0 assert x == 1 ``` will give the failure message 0 == 1, so it shouldn't be different as part of an unroll

Mark visit_all as a private method

5814945

Fix mention of issue #5062 in docstrings

322a0f0

Unroll calls to all on python 2

22d91a3

nicoddemus merged commit 2b9ca34 into pytest-dev:features May 27, 2019

blueyed added a commit to blueyed/pytest that referenced this pull request May 29, 2019

Revert "Unroll calls to any pytest-dev#5062 (pytest-dev#5103)"

d4060a1

This reverts commit 2b9ca34, reversing changes made to 0a57124.

Tadaboody deleted the unroll_all_any_5062 branch May 30, 2019 03:41

RonnyPfannschmidt mentioned this pull request Jun 2, 2019

pytest 4.6.0 breaks matplotlib test gathering with TypeError: cannot unpack non-iterable NoneType object #5358

Closed

4 tasks

macisamuele mentioned this pull request Jun 3, 2019

Fix test failure Yelp/bravado-core#344

Merged

nicoddemus mentioned this pull request Jun 4, 2019

Unroll the iterable for all/any calls to get better reports #5062

Open

4 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Unroll calls to any #5062 #5103

Unroll calls to any #5062 #5103

Tadaboody commented Apr 13, 2019 •

edited

Loading

Tadaboody commented Apr 13, 2019

codecov bot commented Apr 13, 2019 •

edited

Loading

Tadaboody commented Apr 13, 2019 •

edited

Loading

Tadaboody commented Apr 13, 2019

Stranger6667 Apr 13, 2019

danielx123 commented Apr 17, 2019

Tadaboody commented May 9, 2019 •

edited

Loading

nicoddemus left a comment

nicoddemus commented May 18, 2019

Tadaboody commented May 25, 2019

nicoddemus commented May 27, 2019

nicoddemus commented May 27, 2019

blueyed commented May 29, 2019

nicoddemus commented May 29, 2019

Unroll calls to any #5062 #5103

Unroll calls to any #5062 #5103

Conversation

Tadaboody commented Apr 13, 2019 • edited Loading

Tadaboody commented Apr 13, 2019

codecov bot commented Apr 13, 2019 • edited Loading

Codecov Report

Tadaboody commented Apr 13, 2019 • edited Loading

Tadaboody commented Apr 13, 2019

Stranger6667 Apr 13, 2019

Choose a reason for hiding this comment

danielx123 commented Apr 17, 2019

Tadaboody commented May 9, 2019 • edited Loading

nicoddemus left a comment

Choose a reason for hiding this comment

nicoddemus commented May 18, 2019

Tadaboody commented May 25, 2019

nicoddemus commented May 27, 2019

nicoddemus commented May 27, 2019

blueyed commented May 29, 2019

nicoddemus commented May 29, 2019

Tadaboody commented Apr 13, 2019 •

edited

Loading

codecov bot commented Apr 13, 2019 •

edited

Loading

Tadaboody commented Apr 13, 2019 •

edited

Loading

Tadaboody commented May 9, 2019 •

edited

Loading