diff options
| author | Florian Bruhin <git@the-compiler.org> | 2016-03-02 08:05:15 +0100 |
|---|---|---|
| committer | Florian Bruhin <git@the-compiler.org> | 2016-03-02 08:05:15 +0100 |
| commit | 38ac95d907546dc8ddfb0c7f0d9e9b3fbde12b47 (patch) | |
| tree | 92031901c3c815fb6b57d5d9788586aad68a1fdc /pytest.ini | |
| parent | 43a4a6a3e77e4dafd4825d562e60783b00b2cf4b (diff) | |
| download | qutebrowser-38ac95d907546dc8ddfb0c7f0d9e9b3fbde12b47.tar.gz qutebrowser-38ac95d907546dc8ddfb0c7f0d9e9b3fbde12b47.zip | |
Revert "pytest.ini: Remove registration of flaky marker"
This reverts commit 0f5b4d58e22857230cbd487c3a1bde7fd8a18399.
Seems this is needed when freezing, otherwise we get a "'flaky' not a
registered marker" error despite the plugin being installed.
Conflicts:
pytest.ini
Diffstat (limited to 'pytest.ini')
| -rw-r--r-- | pytest.ini | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/pytest.ini b/pytest.ini index e44ad1d77..3d99b7c78 100644 --- a/pytest.ini +++ b/pytest.ini @@ -16,6 +16,7 @@ markers = pyqt531_or_newer: Needs PyQt 5.3.1 or newer. xfail_norun: xfail the test with out running it ci: Tests which should only run on CI. + flaky: Tests which are flaky and should be rerun qt_log_level_fail = WARNING qt_log_ignore = ^SpellCheck: .* |