summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOran Agra <oran@redislabs.com>2020-02-20 17:56:52 +0200
committerOran Agra <oran@redislabs.com>2020-02-23 16:48:37 +0200
commit0a643efa0c86e3053fd9a7bf7a74dfa4d0610f22 (patch)
treefbd827e00e9d2c4671ebf19ec213c93cc41a1b61
parente78c4e813cecfa97505efe29c073f8088542f69e (diff)
downloadredis-0a643efa0c86e3053fd9a7bf7a74dfa4d0610f22.tar.gz
fix race in module api test for fork
in some cases we were trying to kill the fork before it got created
-rw-r--r--tests/modules/fork.c2
-rw-r--r--tests/unit/moduleapi/fork.tcl3
2 files changed, 2 insertions, 3 deletions
diff --git a/tests/modules/fork.c b/tests/modules/fork.c
index 1a139ef1b..0443d9ef0 100644
--- a/tests/modules/fork.c
+++ b/tests/modules/fork.c
@@ -42,7 +42,7 @@ int fork_create(RedisModuleCtx *ctx, RedisModuleString **argv, int argc)
/* child */
RedisModule_Log(ctx, "notice", "fork child started");
- usleep(200000);
+ usleep(500000);
RedisModule_Log(ctx, "notice", "fork child exiting");
RedisModule_ExitFromChild(code_to_exit_with);
/* unreachable */
diff --git a/tests/unit/moduleapi/fork.tcl b/tests/unit/moduleapi/fork.tcl
index f7d7e47d5..8535a3382 100644
--- a/tests/unit/moduleapi/fork.tcl
+++ b/tests/unit/moduleapi/fork.tcl
@@ -20,9 +20,8 @@ start_server {tags {"modules"}} {
test {Module fork kill} {
r fork.create 3
- after 20
+ after 250
r fork.kill
- after 100
assert {[count_log_message "fork child started"] eq "2"}
assert {[count_log_message "Received SIGUSR1 in child"] eq "1"}