Moved redis server integration tests under specific path

danielealbano · Aug 20, 2022 · 5a666fb · 5a666fb
1 parent d5e237a
commit 5a666fb
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 3 deletions.
diff --git a/tests/redis_commands/client.tcl → ...integration_tests/redis_server/client.tcl b/tests/redis_commands/client.tcl → ...integration_tests/redis_server/client.tcl
diff --git a/tests/integration_tests/redis_server/examples/test-example.tcl b/tests/integration_tests/redis_server/examples/test-example.tcl
@@ -0,0 +1,6 @@
+start_server {tags {"example"}} {
+    test {SET and GET example item} {
+        r set x example
+        r get x
+    } {example}
+}
diff --git a/tests/redis_commands/helpers.tcl → ...ntegration_tests/redis_server/helpers.tcl b/tests/redis_commands/helpers.tcl → ...ntegration_tests/redis_server/helpers.tcl
diff --git a/tests/redis_commands/main.tcl → ...s/integration_tests/redis_server/main.tcl b/tests/redis_commands/main.tcl → ...s/integration_tests/redis_server/main.tcl
@@ -35,8 +35,8 @@ set ::server_pid 0;
 set ::socket_host 127.0.0.1
 set ::socket_port 21111
 
-set ::server_path "../../cmake-build-debug/src/cachegrand-server"
-set ::server_cfg "../../etc/cachegrand.yaml.skel"
+set ::server_path "../../../cmake-build-debug/src/cachegrand-server"
+set ::server_cfg "../../../etc/cachegrand.yaml.skel"
 
 ########################
 # Client
@@ -49,7 +49,7 @@ set ::portcount 8000
 ########################
 # Tests
 ########################
-set ::test_path "./tests"
+set ::test_path "./examples"
 set ::num_tests 0
 set ::num_passed 0
 set ::num_failed 0

diff --git a/tests/redis_commands/redis.tcl → .../integration_tests/redis_server/redis.tcl b/tests/redis_commands/redis.tcl → .../integration_tests/redis_server/redis.tcl
diff --git a/tests/redis_commands/server.tcl → ...integration_tests/redis_server/server.tcl b/tests/redis_commands/server.tcl → ...integration_tests/redis_server/server.tcl
@@ -128,6 +128,10 @@ proc kill_server config {
         [dict get $config "client"] close
     }
 
+    if {![dict exists $config "pid"]} {
+        return
+    }
+
     if {![is_alive $config]} {
         return
     }

diff --git a/tests/redis_commands/test.tcl → ...s/integration_tests/redis_server/test.tcl b/tests/redis_commands/test.tcl → ...s/integration_tests/redis_server/test.tcl
@@ -34,6 +34,11 @@ proc execute_test_file __testname {
     set path "$::test_path/$__testname.tcl"
     set ::curfile $path
 
+    if {![file exists $path]} {
+         set path_not_exists "File test not found in this path: $path"
+         send_data_packet $::test_server_fd exception $path_not_exists
+    }
+
     linespacer "#"
     puts  "** Executing test file: $::curfile"
     source $path
-Original file line number
+Diff line change
@@ Expand Up / @@ -128,6 +128,10 @@ proc kill_server config { @@
             [dict get $config "client"] close
         }
+        if {![dict exists $config "pid"]} {
+            return
+        }
         if {![is_alive $config]} {
             return
         }
@@ Expand Down @@