Skip to content

Minor changes #235

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.

Sign up for GitHub

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

Merged
merged 6 commits into from
Sep 13, 2018
Merged

Minor changes #235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b016047
Use pytest.param
The-Compiler Sep 11, 2018
59671e9
Use {posargs} in tox.ini
The-Compiler Sep 11, 2018
c376db7
Make pytest more strict
The-Compiler Sep 11, 2018
2050be8
Register no_qt_log marker properly
The-Compiler Sep 11, 2018
e2acebe
Update changelog
The-Compiler Sep 11, 2018
57bb3da
Make black happy
The-Compiler Sep 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
3.0.3 (unreleased)
------------------

- Improve debugging output when no Qt wrapper was found.
- Register the ``no_qt_log`` marker with pytest so ``--strict`` can be used.

3.0.2 (2018-08-31)
------------------

Expand Down
1 change: 1 addition & 0 deletions pytestqt/plugin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,7 @@ def pytest_configure(config):
config.addinivalue_line(
"markers", "qt_log_ignore: overrides qt_log_ignore ini option."
)
config.addinivalue_line("markers", "no_qt_log: Turn off Qt logging capture.")

if config.getoption("qt_log"):
config.pluginmanager.register(QtLoggingPlugin(config), "_qt_logging")
Expand Down
5 changes: 5 additions & 0 deletions setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,7 @@
[bdist_wheel]
universal = 1

[tool:pytest]
testpaths = tests
addopts = --strict
xfail_strict = true
2 changes: 1 addition & 1 deletion tests/test_qtest_proxies.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"keyEvent",
"keyPress",
"keyRelease",
fails_on_pyqt("keyToAscii"),
pytest.param("keyToAscii", marks=fails_on_pyqt),
"mouseClick",
"mouseDClick",
"mouseMove",
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ deps=
pyside2: pyside2
pyqt5: pyqt5
commands=
pytest tests
pytest {posargs}
setenv=
pyside2: PYTEST_QT_API=pyside2
pyqt5: PYTEST_QT_API=pyqt5
Expand Down