From 9f68aadb742b9cbd70c5cf5d750b64ff534bc8b3 Mon Sep 17 00:00:00 2001 From: Zdenek Kabelac Date: Fri, 6 Jun 2014 17:36:38 +0200 Subject: [PATCH] tests: make timeouts longer Add more time for tests, since debug kernels are getting slower... and we add more and more tests. However many test should be shortened to avoid testing disk-perfomance and focus on lvm functionality... (Often we should probably test with inactive volumes when we check metadata operation of lvm2) We may need to support option for 'DEEP' longer testing. Also something like LVM_TEST_TIMEOUT_FACTOR might be useful though it would be much better if test suite could approximete from system perfomance test lenght... --- test/lib/aux.sh | 2 +- test/lib/harness.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/lib/aux.sh b/test/lib/aux.sh index 3ececaf8a..f6f0d0b49 100644 --- a/test/lib/aux.sh +++ b/test/lib/aux.sh @@ -750,7 +750,7 @@ udev_wait() { # wait_for_sync wait_for_sync() { local i - for i in {1..500} ; do + for i in {1..3000} ; do check in_sync $1 $2 && return sleep .2 done diff --git a/test/lib/harness.c b/test/lib/harness.c index d7e51ee2b..5b0825593 100644 --- a/test/lib/harness.c +++ b/test/lib/harness.c @@ -585,8 +585,8 @@ int main(int argc, char **argv) { /* run the tests */ for (i = 1; !die && i < argc; ++i) { run(i, argv[i]); - if ( time(NULL) - harness_start > 3 * 3600 ) { - printf("3 hours passed, giving up...\n"); + if ( time(NULL) - harness_start > 48 * 360 ) { /* 04:48 */ + printf("Nearly 5 hours passed, giving up...\n"); die = 1; } }