summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobbie Harwood <rharwood@redhat.com>2016-12-07 20:15:14 +0000
committerSimo Sorce <simo@redhat.com>2017-01-12 11:52:20 -0500
commit6ede5dd392d8b8dc1dd40fc406d33712f0aac830 (patch)
treef9df238b5e18715701b02801d6cebb5dce745131
parent40729d65b10242d7c76691988994e673dcfad598 (diff)
downloadgss-proxy-6ede5dd392d8b8dc1dd40fc406d33712f0aac830.tar.gz
gss-proxy-6ede5dd392d8b8dc1dd40fc406d33712f0aac830.tar.xz
gss-proxy-6ede5dd392d8b8dc1dd40fc406d33712f0aac830.zip
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 <rharwood@redhat.com> Reviewed-by: Simo Sorce <simo@redhat.com>
-rw-r--r--proxy/tests/t_acquire.py2
-rwxr-xr-xproxy/tests/t_basic.py4
-rw-r--r--proxy/tests/t_impersonate.py2
3 files changed, 4 insertions, 4 deletions
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