Merge branch 'bdd'

Conflicts:
      tests/test_conftest.py
      tox.ini

1 files changed, 6 insertions, 0 deletions

diff --git a/tests/test_conftest.py b/tests/test_conftest.py
index a5534ef5f..6a2cca57d 100644
--- a/tests/test_conftest.py
+++ b/tests/test_conftest.py
@@ -23,6 +23,7 @@
 import os
 import sys
 import warnings
+import inspect
 
 import pytest
 
@@ -49,3 +50,8 @@ def test_installed_package():
     """Make sure the tests are running against the installed package."""
     print(sys.path)
     assert '.tox' in qutebrowser.__file__.split(os.sep)
+
+
+def test_getargspec():
+    """Make sure the getargspec DeprecationWarning gets ignored."""
+    inspect.getargspec(lambda: None)