From 38ac95d907546dc8ddfb0c7f0d9e9b3fbde12b47 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 2 Mar 2016 08:05:15 +0100
Subject: [PATCH] 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
---
 pytest.ini | 1 +
 1 file changed, 1 insertion(+)

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: .*