From dd225e1b9d17212dfa079c0266336d6fb40de592 Mon Sep 17 00:00:00 2001
From: Kyle Altendorf <kyle.altendorf@epcpower.com>
Date: Thu, 4 Oct 2018 23:15:30 -0400
Subject: [PATCH] Tidy getting of timeout from kwargs

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

diff --git a/src/_pytest/pytester.py b/src/_pytest/pytester.py
index cf50f9ec9..3f4d43eb5 100644
--- a/src/_pytest/pytester.py
+++ b/src/_pytest/pytester.py
@@ -1163,12 +1163,7 @@ class Testdir(object):
             args = ("-p", plugins[0]) + args
         args = self._getpytestargs() + args
 
-        if "timeout" in kwargs:
-            timeout = {"timeout": kwargs["timeout"]}
-        else:
-            timeout = {}
-
-        return self.run(*args, **timeout)
+        return self.run(*args, timeout=kwargs.get("timeout"))
 
     def spawn_pytest(self, string, expect_timeout=10.0):
         """Run pytest using pexpect.