From c335aff9003a8c4509b3781237bc2319f4cfc98b Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 26 Oct 2015 08:53:55 +0100
Subject: [PATCH] Revert "Add pytest-timeout."

This reverts commit 8919a152fe004cc88c167e6e65d0e12195c287b8.

Seems to cause more trouble than it's worth... bogus timeouts on OS X and
Windows, with Windows then hanging...
---
 pytest.ini | 1 -
 tox.ini    | 1 -
 2 files changed, 2 deletions(-)

diff --git a/pytest.ini b/pytest.ini
index 566e3f84e..7fcd91002 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -33,4 +33,3 @@ qt_log_ignore =
     ^virtual void QSslSocketBackendPrivate::transmit\(\) SSL write failed with error: -9805
     ^virtual void QSslSocketBackendPrivate::transmit\(\) SSLRead failed with: -9805
     ^Type conversion already registered from type .*
-timeout = 25
diff --git a/tox.ini b/tox.ini
index b0c1b3956..8bcc51022 100644
--- a/tox.ini
+++ b/tox.ini
@@ -24,7 +24,6 @@ deps =
     pytest-faulthandler==1.0.1
     pytest-sugar==0.5.1
     pytest-travis-fold==1.1.0
-    pytest-timeout==0.5
     xvfbwrapper==0.2.5
     hypothesis==1.12.0
     coverage==4.0.1