Skip to content

Commit 3d53b74

Browse files
committed
[test] remove redundancy test api
1 parent b21849e commit 3d53b74

3 files changed

Lines changed: 9 additions & 40 deletions

File tree

src/Makefile

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -565,22 +565,22 @@ distclean: clean
565565
-(rm -f .make-*)
566566

567567
.PHONY: distclean
568-
.PHONY: build-test-modules
569-
570-
build-test-modules:
571-
@$(MAKE) -C ../tests/modules
572568

573569
ifdef SWAP
574-
test: $(REDIS_SERVER_NAME) $(REDIS_CHECK_AOF_NAME) $(REDIS_CLI_NAME) $(REDIS_BENCHMARK_NAME) build-test-modules
570+
test: $(REDIS_SERVER_NAME) $(REDIS_CHECK_AOF_NAME) $(REDIS_CLI_NAME) $(REDIS_BENCHMARK_NAME)
571+
@$(MAKE) -C ../deps/xredis-gtid build-test-modules
575572
@(cd ..; ./runtest --timeout 3600)
576573

577-
test-asan: $(REDIS_SERVER_NAME) $(REDIS_CHECK_AOF_NAME) $(REDIS_CLI_NAME) $(REDIS_BENCHMARK_NAME) build-test-modules
574+
test-asan: $(REDIS_SERVER_NAME) $(REDIS_CHECK_AOF_NAME) $(REDIS_CLI_NAME) $(REDIS_BENCHMARK_NAME)
575+
@$(MAKE) -C ../deps/xredis-gtid build-test-modules
578576
@(cd ..; ./runtest --tags -nosanitizer --asan --timeout 3600)
579577
else
580-
test: $(REDIS_SERVER_NAME) $(REDIS_CHECK_AOF_NAME) $(REDIS_CLI_NAME) $(REDIS_BENCHMARK_NAME) build-test-modules
578+
test: $(REDIS_SERVER_NAME) $(REDIS_CHECK_AOF_NAME) $(REDIS_CLI_NAME) $(REDIS_BENCHMARK_NAME)
579+
@$(MAKE) -C ../deps/xredis-gtid build-test-modules
581580
@(cd ..; ./runtest)
582581

583-
test-asan: $(REDIS_SERVER_NAME) $(REDIS_CHECK_AOF_NAME) $(REDIS_CLI_NAME) $(REDIS_BENCHMARK_NAME) build-test-modules
582+
test-asan: $(REDIS_SERVER_NAME) $(REDIS_CHECK_AOF_NAME) $(REDIS_CLI_NAME) $(REDIS_BENCHMARK_NAME)
583+
@$(MAKE) -C ../deps/xredis-gtid build-test-modules
584584
@(cd ..; ./runtest --tags -nosanitizer --asan)
585585
endif
586586

tests/modules/propagate.c

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -235,27 +235,6 @@ int propagateTestSimpleCommand(RedisModuleCtx *ctx, RedisModuleString **argv, in
235235
return REDISMODULE_OK;
236236
}
237237

238-
int propagateTestSingleCommand(RedisModuleCtx *ctx, RedisModuleString **argv, int argc)
239-
{
240-
REDISMODULE_NOT_USED(argv);
241-
REDISMODULE_NOT_USED(argc);
242-
243-
/* Replicate a single command - no MULTI/EXEC wrapping. */
244-
RedisModule_Replicate(ctx,"INCR","c","single-counter");
245-
RedisModule_ReplyWithSimpleString(ctx,"OK");
246-
return REDISMODULE_OK;
247-
}
248-
249-
int propagateTestNoreplicateCommand(RedisModuleCtx *ctx, RedisModuleString **argv, int argc)
250-
{
251-
REDISMODULE_NOT_USED(argv);
252-
REDISMODULE_NOT_USED(argc);
253-
254-
/* Do not call RM_Replicate - no propagation expected. */
255-
RedisModule_ReplyWithSimpleString(ctx,"OK");
256-
return REDISMODULE_OK;
257-
}
258-
259238
int propagateTestMixedCommand(RedisModuleCtx *ctx, RedisModuleString **argv, int argc)
260239
{
261240
REDISMODULE_NOT_USED(argv);
@@ -391,16 +370,6 @@ int RedisModule_OnLoad(RedisModuleCtx *ctx, RedisModuleString **argv, int argc)
391370
"",1,1,1) == REDISMODULE_ERR)
392371
return REDISMODULE_ERR;
393372

394-
if (RedisModule_CreateCommand(ctx,"propagate-test.single",
395-
propagateTestSingleCommand,
396-
"",1,1,1) == REDISMODULE_ERR)
397-
return REDISMODULE_ERR;
398-
399-
if (RedisModule_CreateCommand(ctx,"propagate-test.noreplicate",
400-
propagateTestNoreplicateCommand,
401-
"",1,1,1) == REDISMODULE_ERR)
402-
return REDISMODULE_ERR;
403-
404373
if (RedisModule_CreateCommand(ctx,"propagate-test.mixed",
405374
propagateTestMixedCommand,
406375
"write",1,1,1) == REDISMODULE_ERR)

0 commit comments

Comments
 (0)