From e5691036d92a9c11cd87a8ab44ce4fe701c79715 Mon Sep 17 00:00:00 2001
From: John Sully <john@csquare.ca>
Date: Sun, 30 May 2021 02:45:06 +0000
Subject: [PATCH] Fix merge issue with module test script

Former-commit-id: 10d254ec1bcdd9c25e373bbf882db244fecb65d1
---
 runtest-moduleapi               |  1 -
 tests/unit/moduleapi/timers.tcl | 35 ---------------------------------
 2 files changed, 36 deletions(-)
 delete mode 100644 tests/unit/moduleapi/timers.tcl

diff --git a/runtest-moduleapi b/runtest-moduleapi
index 2e5bffcba..dc4c9e1ea 100755
--- a/runtest-moduleapi
+++ b/runtest-moduleapi
@@ -31,7 +31,6 @@ $TCLSH tests/test_helper.tcl \
 --single unit/moduleapi/blockedclient \
 --single unit/moduleapi/moduleloadsave \
 --single unit/moduleapi/getkeys \
---single unit/moduleapi/timers \
 --single unit/moduleapi/test_lazyfree \
 --single unit/moduleapi/defrag \
 --single unit/moduleapi/hash \
diff --git a/tests/unit/moduleapi/timers.tcl b/tests/unit/moduleapi/timers.tcl
deleted file mode 100644
index 6d6113f6b..000000000
--- a/tests/unit/moduleapi/timers.tcl
+++ /dev/null
@@ -1,35 +0,0 @@
-set testmodule [file normalize tests/modules/timers.so]
-set timercount 4000
-
-
-tags "modules" {
-    test {Ascending module timers can load in correctly} {
-        start_server [list overrides [list loadmodule "$testmodule ascending $timercount"]] {
-            wait_for_condition [expr round($timercount/10)] 20 {
-                [r timer.elapsed] == $timercount
-            } else {
-                fail "Server failed to load in timers with ascending periods"
-            }
-        }
-    }
-    
-    test {Descending module timers can load in correctly} {
-        start_server [list overrides [list loadmodule "$testmodule descending $timercount"]] {
-            wait_for_condition [expr round($timercount/10)] 20 {
-                [r timer.elapsed] == $timercount
-            } else {
-                fail "Server failed to load in timers with descending periods"
-            }
-        }
-    }
-
-    test {Module timers with the same period can load in correctly} {
-        start_server [list overrides [list loadmodule "$testmodule same $timercount"]] {
-            wait_for_condition [expr round($timercount/10)] 20 {
-                [r timer.elapsed] == $timercount
-            } else {
-                fail "Server failed to load in timers with the same period"
-            }
-        }
-    }
-}