Tidy getting of timeout from kwargs
This commit is contained in:
parent
900cef6397
commit
dd225e1b9d
|
@ -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.
|
||||
|
|
Loading…
Reference in New Issue