From 6ede5dd392d8b8dc1dd40fc406d33712f0aac830 Mon Sep 17 00:00:00 2001 From: Robbie Harwood Date: Jan 12 2017 16:52:20 +0000 Subject: Lower 30-second timeouts to 10 Since we actually hit some of these timeouts on purpose, this speeds up the test suite rather noticeably. Signed-off-by: Robbie Harwood Reviewed-by: Simo Sorce --- diff --git a/proxy/tests/t_acquire.py b/proxy/tests/t_acquire.py index f0cc2d7..b9edbba 100644 --- a/proxy/tests/t_acquire.py +++ b/proxy/tests/t_acquire.py @@ -24,7 +24,7 @@ def run(testdir, env, conf, expected_failure=False): p1 = subprocess.Popen(cmd, stderr=subprocess.STDOUT, stdout=logfile, env=testenv, preexec_fn=os.setsid) try: - p1.wait(30) + p1.wait(10) except subprocess.TimeoutExpired: # p1.returncode is set to None here pass diff --git a/proxy/tests/t_basic.py b/proxy/tests/t_basic.py index f221e6f..faa13c3 100755 --- a/proxy/tests/t_basic.py +++ b/proxy/tests/t_basic.py @@ -42,8 +42,8 @@ def run(testdir, env, conf, expected_failure=False): stderr=logfile, env=svcenv, preexec_fn=os.setsid) try: - p1.wait(30) - p2.wait(30) + p1.wait(10) + p2.wait(10) except subprocess.TimeoutExpired: # {p1,p2}.returncode are set to None here pass diff --git a/proxy/tests/t_impersonate.py b/proxy/tests/t_impersonate.py index 92a1d1d..43bb084 100644 --- a/proxy/tests/t_impersonate.py +++ b/proxy/tests/t_impersonate.py @@ -23,7 +23,7 @@ def run(testdir, env, conf, expected_failure=False): p1 = subprocess.Popen(cmd, stderr=subprocess.STDOUT, stdout=logfile, env=testenv, preexec_fn=os.setsid) try: - p1.wait(30) + p1.wait(10) except subprocess.TimeoutExpired: # p1.returncode is set to None here pass