Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve of the test output for logical expression with brackets. #1669

Merged
merged 1 commit into from
Jun 26, 2016

Conversation

RedBeardCode
Copy link
Contributor

Tries put subexpression into brackets. Checks in the assertion rewriting in one operator is a expression itself and put it in brackets

Fixes #925

@RedBeardCode
Copy link
Contributor Author

The assertion rewriting tries to combine boolean operations and only show the part which is False. I think this is a nice feature. For example

def test_and_braces():
>       assert (False or False) and False
E       assert ((False or False))

@coveralls
Copy link

coveralls commented Jun 25, 2016

Coverage Status

Coverage increased (+0.004%) to 92.29% when pulling e2f5501 on RedBeardCode:issue925/logic_brackets into c519b95 on pytest-dev:master.

.. _#1479: https://github.com/pytest-dev/pytest/issues/1479
=======
.. _#925: https://github.com/pytest-dev/pytest/issues/925
>>>>>>> Improve of the test output for logical expression with brackets.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Those conflict markers don't belong here 😉

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed

@nicoddemus nicoddemus merged commit e2f5501 into pytest-dev:master Jun 26, 2016
@nicoddemus
Copy link
Member

Thanks again @RedBeardCode! 😁

@RedBeardCode
Copy link
Contributor Author

Thanks ’@nicoddemus’_ for doing my work.

@nicoddemus
Copy link
Member

Hehehe don't mention it

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants