Verify that tor bootstrapped correctly and tgen streams completed

stevenengler · stevenengler · commit 751ddf1baca8 · 2021-03-22T19:30:49.000-04:00
diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
@@ -45,7 +45,7 @@ endmacro()
 ## example: add_shadow_tests(BASENAME bind METHODS ptrace preload LOGLEVEL debug ARGS --pin-cpus)
 ## will create two tests named bind-shadow-ptrace and bind-shadow-preload
 macro(add_shadow_tests)
-    cmake_parse_arguments(SHADOW_TEST "" "BASENAME;LOGLEVEL;SHADOW_CONFIG;CHECK_RETVAL" "METHODS;ARGS;CONFIGURATIONS;PROPERTIES" ${ARGN})
+   cmake_parse_arguments(SHADOW_TEST "" "BASENAME;LOGLEVEL;SHADOW_CONFIG;CHECK_RETVAL;POST_CMD" "METHODS;ARGS;CONFIGURATIONS;PROPERTIES" ${ARGN})
 
    if(NOT DEFINED SHADOW_TEST_LOGLEVEL)
       set(SHADOW_TEST_LOGLEVEL "debug")
@@ -58,6 +58,10 @@ macro(add_shadow_tests)
    if(NOT DEFINED SHADOW_TEST_CHECK_RETVAL)
       set(SHADOW_TEST_CHECK_RETVAL TRUE)
    endif()
+
+   if(NOT DEFINED SHADOW_TEST_POST_CMD)
+      set(SHADOW_TEST_POST_CMD "true")
+   endif()
    
    string(REPLACE ";" " " SHADOW_TEST_ARGS "${SHADOW_TEST_ARGS}")
 
@@ -72,6 +76,7 @@ macro(add_shadow_tests)
          --log-level=${SHADOW_TEST_LOGLEVEL} \
          ${SHADOW_TEST_ARGS} \
          - \
+         && (${SHADOW_TEST_POST_CMD}) \
          "
       )
       
diff --git a/src/test/tor/minimal/CMakeLists.txt b/src/test/tor/minimal/CMakeLists.txt
@@ -1,7 +1,7 @@
 add_custom_target(tor-minimal-shadow-conf ALL
                   COMMAND ${CMAKE_COMMAND}
                     -E copy_directory
-                    ${CMAKE_SOURCE_DIR}/src/test/tor/minimal/conf
+                    ${CMAKE_CURRENT_SOURCE_DIR}/conf
                     ${CMAKE_CURRENT_BINARY_DIR}/conf
                   # older tor versions don't support the AuthDirTestReachability torrc option,
                   # so comment out those lines if not supported
@@ -14,7 +14,7 @@ add_custom_target(tor-minimal-shadow-conf ALL
 add_custom_target(tor-minimal-shadow-data-template ALL
                   COMMAND ${CMAKE_COMMAND}
                     -E copy_directory
-                    ${CMAKE_SOURCE_DIR}/src/test/tor/minimal/shadow.data.template
+                    ${CMAKE_CURRENT_SOURCE_DIR}/shadow.data.template
                     ${CMAKE_CURRENT_BINARY_DIR}/shadow.data.template
                   COMMAND chmod
                     0700
@@ -30,6 +30,7 @@ add_shadow_tests(BASENAME tor-minimal
                    --pin-cpus
                    --workers 2
                    --data-template "shadow.data.template"
+                 POST_CMD "${CMAKE_CURRENT_SOURCE_DIR}/verify.sh"
                  PROPERTIES
                    TIMEOUT 180
                    LABELS tor
diff --git a/src/test/tor/minimal/verify.sh b/src/test/tor/minimal/verify.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+bootstrapped_count="$(grep -r --include="*.tor.*.stdout" "Bootstrapped 100" | wc -l)"
+echo "Bootstrapped count: ${bootstrapped_count}"
+
+if [ "${bootstrapped_count}" != "9" ]; then
+    echo "Not all tor processes bootstrapped"
+    exit 1
+fi
+
+stream_count="$(grep -r --include="*.tgen.*.stdout" "stream-success" | wc -l)"
+echo "Successful tgen stream count: ${stream_count}"
+
+if [ "${stream_count}" != "80" ]; then
+    echo "Not all tgen streams were successful"
+    exit 1
+fi
