From ac68c9627949d4079dbe85e951eaaec62e3ad4ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miguel=20S=C3=A1nchez=20de=20Le=C3=B3n=20Peque?=
 <msdeleon@opensistemas.com>
Date: Fri, 3 Feb 2017 10:23:01 +0100
Subject: [PATCH] Re-integrate pytest-timeout plugin

---
 setup.py | 1 +
 tox.ini  | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/setup.py b/setup.py
index d8b77f3..941ceb9 100644
--- a/setup.py
+++ b/setup.py
@@ -66,6 +66,7 @@
             'pytest',
             'pytest-cov',
             'pytest-rerunfailures',
+            'pytest-timeout',
             'pytest-xdist',
         ],
     },
diff --git a/tox.ini b/tox.ini
index 68a6c6f..852d63d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,6 +8,9 @@ envlist =
     lint
     docs
 
+[pytest]
+timeout = 10
+
 [flake8]
 per-file-ignores =
     docs/source/conf.py: E121,E122,E265,E501