From 36421934f900d3d58a9780d53beeb6fd280c9958 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 30 Mar 2015 22:09:56 +0200
Subject: [PATCH] tox: Use pytest instead of unittest.

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

diff --git a/tox.ini b/tox.ini
index 5790eac68..8abb14cd5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -16,19 +16,23 @@ usedevelop = true
 
 [testenv:unittests]
 setenv = QT_QPA_PLATFORM_PLUGIN_PATH={envsitepackagesdir}/PyQt5/plugins/platforms
+deps =
+    py==1.4.26
+    pytest==2.7.0
 # We don't use {[testenv:mkvenv]commands} here because that seems to be broken
 # on Ubuntu Trusty.
 commands =
     {envpython} scripts/link_pyqt.py --tox {envdir}
-    {envpython} -m unittest
+    {envpython} -m py.test
 
 [testenv:coverage]
 deps =
+    {[testenv:unittests]deps}
     coverage==3.7.1
 commands =
     {[testenv:mkvenv]commands}
     {envpython} -m coverage erase
-    {envpython} -m coverage run --branch --source=qutebrowser -m unittest
+    {envpython} -m coverage run --branch --source=qutebrowser -m py.test
     {envpython} -m coverage html
     {envpython} scripts/print_coverage.py