From d607c070e7cf591a8637f5f2dcfd1c3f61d2e1b2 Mon Sep 17 00:00:00 2001
From: androm3da <brian.cain@gmail.com>
Date: Sat, 27 Jan 2018 20:33:11 -0600
Subject: [PATCH] [CI config] Reduce per-test timeouts

- Reduce timeouts to 7 mins
- Enable timeout for load test
---
 ci/test.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ci/test.sh b/ci/test.sh
index b24b1de1..64f13f48 100755
--- a/ci/test.sh
+++ b/ci/test.sh
@@ -25,7 +25,7 @@ xvfb_run_() {
     Xvfb :2 -screen 0 1024x768x24 &
     xvfb_pid=$!
     sleep ${INIT_DELAY_SEC}
-    DISPLAY=:2 ${TIMEOUT_CMD} ${TIMEOUT_TIME_ARG} ${TIMEOUT_SEC-600} $@
+    DISPLAY=:2 ${TIMEOUT_CMD} ${TIMEOUT_TIME_ARG} ${TIMEOUT_SEC-420} $@
     res=${?}
     kill ${xvfb_pid}
 
@@ -41,18 +41,18 @@ run_tests() {
         TIMEOUT_TIME_ARG=""
     fi
 
-    ${TIMEOUT_CMD} ${TIMEOUT_TIME_ARG} ${TIMEOUT_SEC-600} ./core_test
+    ${TIMEOUT_CMD} ${TIMEOUT_TIME_ARG} ${TIMEOUT_SEC-420} ./core_test
     core_test_res=${?}
 
     xvfb_run_ ./qt_test
     qt_test_res=${?}
 
-    ./load_test ./rai_node
+    ${TIMEOUT_CMD} ${TIMEOUT_TIME_ARG} ${TIMEOUT_SEC-420} ./load_test ./rai_node
     load_test_res=${?}
 
     echo "Core Test return code: ${core_test_res}"
     echo "QT Test return code: ${qt_test_res}"
-    echo "Load Test return code: ${qt_test_res}"
+    echo "Load Test return code: ${load_test_res}"
     return $((${core_test_res} + ${qt_test_res} + ${load_test_res}))
 }