From e23894590df27068d24c95e565b2d90b3f34fa5a Mon Sep 17 00:00:00 2001
From: Ricky Diaz Gomez <rickydia@umich.edu>
Date: Mon, 1 Jul 2019 16:24:10 -0400
Subject: [PATCH] Redis: Removed the tests that test the --mappings and
 --custom-commands flags for the Redis scanner.

---
 integration_tests/redis/test.sh | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/integration_tests/redis/test.sh b/integration_tests/redis/test.sh
index 60aa01d..555575a 100755
--- a/integration_tests/redis/test.sh
+++ b/integration_tests/redis/test.sh
@@ -4,7 +4,11 @@ set -e
 MODULE_DIR=$(dirname $0)
 ZGRAB_ROOT=$MODULE_DIR/../..
 ZGRAB_OUTPUT=$ZGRAB_ROOT/zgrab-output
-CONTAINER_DIR="./integration_tests/redis/container"
+
+# FIXME: Find a way to mount host to container and have it pass CircleCI tests.
+# MOUNT_HOST="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )/container"
+# MOUNT_CONTAINER="/var/tmp/input/redis"
+# EXTRA_DOCKER_ARGS="-v $MOUNT_HOST:$MOUNT_CONTAINER"
 
 mkdir -p $ZGRAB_OUTPUT/redis
 
@@ -16,11 +20,11 @@ for cfg in $configs; do
     CONTAINER_NAME=zgrab_redis_${cfg}
     echo "redis/test: Testing $CONTAINER_NAME"
     CONTAINER_NAME=$CONTAINER_NAME "$ZGRAB_ROOT/docker-runner/docker-run.sh" redis > "$ZGRAB_OUTPUT/redis/${cfg}-normal.json"
-    CONTAINER_NAME=$CONTAINER_NAME "$ZGRAB_ROOT/docker-runner/docker-run.sh" redis --mappings "$CONTAINER_DIR/mappings.json" > "$ZGRAB_OUTPUT/redis/${cfg}-normal-mappings.json"
-    CONTAINER_NAME=$CONTAINER_NAME "$ZGRAB_ROOT/docker-runner/docker-run.sh" redis --custom-commands "$CONTAINER_DIR/extra-commands.json" > "$ZGRAB_OUTPUT/redis/${cfg}-normal-extra.json"
     CONTAINER_NAME=$CONTAINER_NAME "$ZGRAB_ROOT/docker-runner/docker-run.sh" redis --inline > "$ZGRAB_OUTPUT/redis/${cfg}-inline.json"
-    CONTAINER_NAME=$CONTAINER_NAME "$ZGRAB_ROOT/docker-runner/docker-run.sh" redis --inline --mappings "$CONTAINER_DIR/mappings.yaml" > "$ZGRAB_OUTPUT/redis/${cfg}-inline-mappings.json"
-    CONTAINER_NAME=$CONTAINER_NAME "$ZGRAB_ROOT/docker-runner/docker-run.sh" redis --inline --custom-commands "$CONTAINER_DIR/extra-commands.yaml" > "$ZGRAB_OUTPUT/redis/${cfg}-inline-extra.json"
+#     CONTAINER_NAME=$CONTAINER_NAME EXTRA_DOCKER_ARGS=$EXTRA_DOCKER_ARGS "$ZGRAB_ROOT/docker-runner/docker-run.sh" redis --mappings "$MOUNT_CONTAINER/mappings.json" > "$ZGRAB_OUTPUT/redis/${cfg}-normal-mappings.json"
+#     CONTAINER_NAME=$CONTAINER_NAME EXTRA_DOCKER_ARGS=$EXTRA_DOCKER_ARGS "$ZGRAB_ROOT/docker-runner/docker-run.sh" redis --inline --mappings "$MOUNT_CONTAINER/mappings.yaml" > "$ZGRAB_OUTPUT/redis/${cfg}-inline-mappings.json"
+#     CONTAINER_NAME=$CONTAINER_NAME EXTRA_DOCKER_ARGS=$EXTRA_DOCKER_ARGS "$ZGRAB_ROOT/docker-runner/docker-run.sh" redis --custom-commands "$MOUNT_CONTAINER/extra-commands.json" > "$ZGRAB_OUTPUT/redis/${cfg}-normal-extra.json"
+#     CONTAINER_NAME=$CONTAINER_NAME EXTRA_DOCKER_ARGS=$EXTRA_DOCKER_ARGS "$ZGRAB_ROOT/docker-runner/docker-run.sh" redis --inline --custom-commands "$MOUNT_CONTAINER/extra-commands.yaml" > "$ZGRAB_OUTPUT/redis/${cfg}-inline-extra.json"
 done
 
 for cfg in $configs; do