diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2012-10-01 12:01:02 +1300 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2012-10-01 12:01:02 +1300 |
| commit | 915bcfbd305d7b18de07f4f40dab1e49a06b132c (patch) | |
| tree | 1b2e0226e9ad9e3a5ac97d643886faa80740b113 /test/tutils.py | |
| parent | 8bb81be2b07b4b93a8ec7c088bf1ff4728fcec21 (diff) | |
| download | mitmproxy-915bcfbd305d7b18de07f4f40dab1e49a06b132c.tar.gz mitmproxy-915bcfbd305d7b18de07f4f40dab1e49a06b132c.tar.bz2 mitmproxy-915bcfbd305d7b18de07f4f40dab1e49a06b132c.zip | |
Add timeout argument to Pathod, and matching -t command-line option.
Diffstat (limited to 'test/tutils.py')
| -rw-r--r-- | test/tutils.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/test/tutils.py b/test/tutils.py index 60f2ffc0..8e7bca20 100644 --- a/test/tutils.py +++ b/test/tutils.py @@ -8,6 +8,7 @@ class DaemonTests: noapi = False nohang = False ssl = False + timeout = None @classmethod def setUpAll(self): self.d = test.Daemon( @@ -17,7 +18,8 @@ class DaemonTests: sizelimit=1*1024*1024, noweb = self.noweb, noapi = self.noapi, - nohang = self.nohang + nohang = self.nohang, + timeout = self.timeout, ) @classmethod |