From 42422a7f629265bdcd1afb76a44911cb4673b95e Mon Sep 17 00:00:00 2001
From: Kyle Altendorf <kyle.altendorf@epcpower.com>
Date: Fri, 5 Oct 2018 00:30:25 -0400
Subject: [PATCH] Throw away arbitrary args to runpytest_subprocess()

---
 src/_pytest/pytester.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/_pytest/pytester.py b/src/_pytest/pytester.py
index a20c281e1..8c283431a 100644
--- a/src/_pytest/pytester.py
+++ b/src/_pytest/pytester.py
@@ -1154,9 +1154,6 @@ class Testdir(object):
         Returns a :py:class:`RunResult`.
 
         """
-        timeout = kwargs.pop("timeout", None)
-        raise_on_kwargs(kwargs)
-
         p = py.path.local.make_numbered_dir(
             prefix="runpytest-", keep=None, rootdir=self.tmpdir
         )
@@ -1165,7 +1162,7 @@ class Testdir(object):
         if plugins:
             args = ("-p", plugins[0]) + args
         args = self._getpytestargs() + args
-        return self.run(*args, timeout=timeout)
+        return self.run(*args, timeout=kwargs.get("timeout"))
 
     def spawn_pytest(self, string, expect_timeout=10.0):
         """Run pytest using pexpect.