From c098d0de37c92954f9db717f037dfe4b53d8c06c Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 20 Apr 2015 18:02:04 +0200
Subject: [PATCH 1/2] Register the gui marker in tox.ini.

---
 tox.ini | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tox.ini b/tox.ini
index 101d2b02c..0f943e8d3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -109,3 +109,5 @@ commands =
 
 [pytest]
 norecursedirs = .tox .venv
+markers =
+    gui: Tests using the GUI (e.g. spawning widgets)

From 1b13b0c385e9297bc9b74223d65216c731b1445c Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 20 Apr 2015 18:02:59 +0200
Subject: [PATCH 2/2] Add --strict to pytest invocation.

---
 tox.ini | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tox.ini b/tox.ini
index 0f943e8d3..d1e337271 100644
--- a/tox.ini
+++ b/tox.ini
@@ -26,7 +26,7 @@ deps =
 # on Ubuntu Trusty.
 commands =
     {envpython} scripts/link_pyqt.py --tox {envdir}
-    {envpython} -m py.test {posargs}
+    {envpython} -m py.test --strict {posargs}
 
 [testenv:coverage]
 deps =
@@ -36,7 +36,7 @@ deps =
     cov-core==1.15.0
 commands =
     {[testenv:mkvenv]commands}
-    {envpython} -m py.test --cov qutebrowser --cov-report term --cov-report html {posargs}
+    {envpython} -m py.test --strict --cov qutebrowser --cov-report term --cov-report html {posargs}
 
 [testenv:misc]
 commands =