Change value to 1

and fix merge conflict markers Signed-off-by: Viktor Söderqvist <[email protected]>
valkey-io · Jan 19, 2025 · b0a3f41 · b0a3f41
1 parent 57fe2b3
commit b0a3f41
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/tests/unit/latency-monitor.tcl b/tests/unit/latency-monitor.tcl
@@ -143,11 +143,7 @@ tags {"needs:debug"} {
 } ;# tag
 
     test {LATENCY of expire events are correctly collected} {
-<<<<<<< Updated upstream
-        r config set latency-monitor-threshold 5
-=======
-        r config set latency-monitor-threshold 2
->>>>>>> Stashed changes
+        r config set latency-monitor-threshold 1
         r config set lazyfree-lazy-expire no
         r flushdb
         if {$::valgrind} {set count 100000} else {set count 1000000}