From 3d15a7b65a5c9d599bf75dbf9e21ffdd07f76041 Mon Sep 17 00:00:00 2001
From: VivekSainiEQ <vivek@eqalpha.com>
Date: Mon, 30 Nov 2020 21:38:04 +0000
Subject: [PATCH] Removed use of module datatypes, now should work if
 tests/modules is not built

Former-commit-id: 089f28e8ba91ed2b875048efa0b28ceb32010541
---
 tests/assets/redis-save.rdb | Bin 268 -> 247 bytes
 tests/unit/loadsave.tcl     |  10 ++++------
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/tests/assets/redis-save.rdb b/tests/assets/redis-save.rdb
index efcbb6de43df678e4a39291feffede5a4e1a6c81..41478af228ae64225d8d89ac70940b44e652ba81 100644
GIT binary patch
delta 61
zcmV-D0K)%_0`~!sHYZ|b#b5deb#rB8Ep26O!uUiD0QwAJZ)PoUa%Ev{Vr*r=0R8~`
T29aGbk)mP<%2037ABPkc3?CTY

delta 83
zcmV-Z0IdJ_0gM8WHYe>{#b5deb#rB8Ep26O!eB)W0QwAJZ)PoUa%Ev{Vr*r=0R8~`
p2a#Pc6$b=lVRT`Ewd*ba|J}3!0s;lV3ILIfVhDvibZ$)&n;49gAgTZW

diff --git a/tests/unit/loadsave.tcl b/tests/unit/loadsave.tcl
index 8ef4fd1e8..28052fc0d 100644
--- a/tests/unit/loadsave.tcl
+++ b/tests/unit/loadsave.tcl
@@ -1,10 +1,9 @@
 set server_path [tmpdir "server.rdb-encoding-test"]
-set testmodule [file normalize tests/modules/datatype.so]
 
 # Store a bunch of datatypes to the database,
 # compute the hash of the database,
 # and save the data to a file
-start_server  [list tags [list "loadsave"] overrides [list "dir" $server_path "loadmodule" $testmodule] keep_persistence true] {
+start_server  [list tags [list "loadsave"] overrides [list "dir" $server_path] keep_persistence true] {
 
     test "Save various data types to .rdb file" {
         r set "int" [expr {int(rand()*10000)}]
@@ -13,7 +12,6 @@ start_server  [list tags [list "loadsave"] overrides [list "dir" $server_path "l
         r sadd "set" [string repeat A [expr {int(rand()*1000)}]]
         r zadd "zset" [expr {rand()}] [string repeat A [expr {int(rand()*1000)}]]
         r lpush "list" [string repeat A [expr {int(rand()*1000)}]]
-        r datatype.set dtkey 100 stringval
         r keydb.cron "cron" single [expr {10000 + int(rand()*1000)}] "return 0" 0;# set delay long enough so it doesn't contend with saving
         set saved_digest [r debug digest];# debug digest computes the hash
         r save
@@ -22,7 +20,7 @@ start_server  [list tags [list "loadsave"] overrides [list "dir" $server_path "l
 
 # Load that data back from the file,
 # and compare its hash to the previously computed hash
-start_server [list tags [list "loadsave"] overrides [list "dir" $server_path "loadmodule" $testmodule] keep_persistence true] {
+start_server [list tags [list "loadsave"] overrides [list "dir" $server_path] keep_persistence true] {
     test "Load various data types from .rdb file" {
         set loaded_digest [r debug digest]
         if {![string match $saved_digest $loaded_digest]} {
@@ -33,10 +31,10 @@ start_server [list tags [list "loadsave"] overrides [list "dir" $server_path "lo
 
 # Load in data from a redis instance
 # The hash should match what we get in redis
-set saved_digest 26ce4a819a86355af7ec75c7a3410f5b9fad02f3
+set saved_digest 0cff3e9c86eb26ef3b5c0e6bac8315829ad6adf4
 exec cp -f tests/assets/redis-save.rdb $server_path/dump.rdb 
 
-start_server [list tags [list "loadsave"] overrides [list "dir" $server_path "loadmodule" $testmodule] keep_persistence true] {
+start_server [list tags [list "loadsave"] overrides [list "dir" $server_path] keep_persistence true] {
     test "Load various data types from Redis generated .rdb file" {
         set loaded_digest [r debug digest]
         if {![string match $saved_digest $loaded_digest]} {