diff options
author | Lukas Slebodnik <lslebodn@redhat.com> | 2014-10-21 20:29:15 +0200 |
---|---|---|
committer | Jakub Hrozek <jhrozek@redhat.com> | 2014-10-22 12:40:18 +0200 |
commit | 482914ed19e46146b3dd567fd0ce0faccd097e9d (patch) | |
tree | 3453bfb4f843da09dada6b62939bff85cee1b753 /src/tests | |
parent | 5192d5db927d718e2bb1b6551753a836b2a3291a (diff) | |
download | sssd-482914ed19e46146b3dd567fd0ce0faccd097e9d.tar.gz sssd-482914ed19e46146b3dd567fd0ce0faccd097e9d.tar.xz sssd-482914ed19e46146b3dd567fd0ce0faccd097e9d.zip |
test_server: Fix waiting for background process
A waiting loop for background process was very fast (just 5 milliseconds)
It caused problem when test was executed with valgrind.
The maximum time was increased to 10 seconds.
Reviewed-by: Jakub Hrozek <jhrozek@redhat.com>
Diffstat (limited to 'src/tests')
-rw-r--r-- | src/tests/cwrap/test_server.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/tests/cwrap/test_server.c b/src/tests/cwrap/test_server.c index 26ecfee1e..d0aeac47d 100644 --- a/src/tests/cwrap/test_server.c +++ b/src/tests/cwrap/test_server.c @@ -55,12 +55,13 @@ static void wait_for_bg_server(const char *pidfile) struct stat sb; count++; - if (count > 100) { + if (count > 200) { + fail(); break; } ret = stat(pidfile, &sb); - usleep(50); + usleep(50000); } while (ret != 0); /* read the pidfile */ @@ -198,7 +199,9 @@ int main(int argc, const char *argv[]) test_dom_suite_setup(TEST_DB_PATH); rv = run_tests(tests); - test_dom_suite_cleanup(TEST_DB_PATH, CONFDB_FILE, NULL); + if (rv != 0) { + test_dom_suite_cleanup(TEST_DB_PATH, CONFDB_FILE, NULL); + } return rv; } |