Removed pytest-timout because it's causing too many problems on travi…

…s. (#11559)
okly366 · Nov 4, 2018 · 58432f2 · 58432f2
1 parent 1d10fe2
commit 58432f2
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 5 deletions.
diff --git a/pytest.ini b/pytest.ini
@@ -7,10 +7,6 @@ addopts=-v
 # Do not run tests in the build folder
 norecursedirs= build
 
-# Running all tests should take less than 12 minutes.
-# Otherwise, something went wrong.
-timeout = 720
-
 # PEP-8 The following are ignored:
 # E501 line too long (82 > 79 characters)
 # E402 module level import not at top of file - temporary measure to continue adding ros python packaged in sys.path

diff --git a/setup.py b/setup.py
@@ -45,7 +45,6 @@
                     'pytest-pep8',
                     'pytest-xdist',
                     'pytest-cov',
-                    'pytest-timeout',
                     'pandas',
                     'requests'],
       },