From 91bc7597c7ed00612b0143efe242a267dd2ebdf6 Mon Sep 17 00:00:00 2001
From: Oran Agra <oran@redislabs.com>
Date: Mon, 15 Feb 2021 17:20:03 +0200
Subject: [PATCH] minor test suite cleanup, revive old test (#8497)

There are two tests in other.tcl that were dependant of the sha1 package
import which meant that they didn't usually run.
The reason it was like that was that prior to the creation of DEBUG
DIGEST, the test suite used to have an equivalent function, but that's
no longer the case and this dependency isn't needed.

The other change is to revert config changes done by the test before the
test suite continues. can be useful if using `--host` to run multiple
units against the same server
---
 tests/unit/other.tcl     | 2 +-
 tests/unit/scripting.tcl | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/tests/unit/other.tcl b/tests/unit/other.tcl
index a35ac1752..16ed092be 100644
--- a/tests/unit/other.tcl
+++ b/tests/unit/other.tcl
@@ -55,7 +55,7 @@ start_server {tags {"other"}} {
     } {*index is out of range*}
 
     tags {consistency} {
-        if {![catch {package require sha1}]} {
+        if {true} {
             if {$::accurate} {set numops 10000} else {set numops 1000}
             test {Check consistency of different data types after a reload} {
                 r flushdb
diff --git a/tests/unit/scripting.tcl b/tests/unit/scripting.tcl
index 3aa3c0fba..c44ec74f5 100644
--- a/tests/unit/scripting.tcl
+++ b/tests/unit/scripting.tcl
@@ -468,6 +468,7 @@ start_server {tags {"scripting"}} {
         r slaveof no one
         set res
     } {102}
+    r config set aof-use-rdb-preamble yes
 
     test {EVAL timeout from AOF} {
         # generate a long running script that is propagated to the AOF as script
@@ -505,8 +506,6 @@ start_server {tags {"scripting"}} {
         $rd close
         r get x
     } {y}
-    r config set aof-use-rdb-preamble yes
-    r config set lua-replicate-commands yes
 
     test {We can call scripts rewriting client->argv from Lua} {
         r del myset