Update tests

Miguel-Dorta · May 9, 2020 · a8108e9 · a8108e9
1 parent 99b8b65
commit a8108e9
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 11 deletions.
diff --git a/go.sum b/go.sum
@@ -1,12 +1,8 @@
 github.com/Miguel-Dorta/logolang v0.5.1 h1:drWDDA6xmP1eKOtl9jS24PW1bvWapKmThhoIbZ4otGo=
 github.com/Miguel-Dorta/logolang v0.5.1/go.mod h1:ZGbUj/BQ6+M6FmHuXS8T2oZf2vkhRBfbiv1MsN746bI=
-github.com/Miguel-Dorta/si v0.0.0-20200206205832-c3abcfc62378 h1:ppK9byrhnNkruRKSOeMXf76skjPC0X/woJ0oUnv77Zw=
-github.com/Miguel-Dorta/si v0.0.0-20200206205832-c3abcfc62378/go.mod h1:8zEKBhks7lAZvGcUbzMC5tvYHOyvLUpIzXJJCY+1PnE=
 github.com/Miguel-Dorta/si v1.0.0 h1:AinuiXJ3FH0chuabYihWLqkCi366gX5RmlxwbvQbl3c=
 github.com/Miguel-Dorta/si v1.0.0/go.mod h1:+maP9EWvS9SnBif6XySYDeJo5VLb4jGmuQwhRbTGR88=
 golang.org/x/sys v0.0.0-20190621203818-d432491b9138/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e h1:9vRrk9YW2BTzLP0VCB9ZDjU4cPqkg+IDWL7XgxA1yxQ=
-golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200409092240-59c9f1ba88fa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200509044756-6aff5f38e54f h1:mOhmO9WsBaJCNmaZHPtHs9wOcdqdKCjF6OPJlmDM3KI=
 golang.org/x/sys v0.0.0-20200509044756-6aff5f38e54f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
diff --git a/test/APPIP01WV4_sort/test.sh b/test/APPIP01WV4_sort/test.sh
@@ -8,7 +8,7 @@ BUILD_PATH="${TMP_DIR}/build/${PROGRAM_NAME}"
 CHECK_PATH="${TMP_DIR}/build/check"
 GEN_PATH="${TMP_DIR}/build/generate"
 FILES_PATH="${TMP_DIR}/files.json"
-PID_PATH="${TMP_DIR}/pid.pid"
+PID_PATH="${TMP_DIR}"
 
 # Exit in case of error
 set -e
@@ -26,7 +26,7 @@ function test_APPIP01WV4_sort() {
   $GEN_PATH "$DATA_DIR" "$FILES_PATH"
 
   # Execute it
-  $BUILD_PATH -from "$DATA_DIR" -to "$SORT_DIR" -pid "$PID_PATH"
+  $BUILD_PATH -from "$DATA_DIR" -to "$SORT_DIR" -pid-directory "$PID_PATH"
 
   # Execute test for checking it
   $CHECK_PATH "$SORT_DIR" "$FILES_PATH"

diff --git a/test/CNETCAM_sort/test.sh b/test/CNETCAM_sort/test.sh
@@ -8,7 +8,7 @@ BUILD_PATH="${TMP_DIR}/build/${PROGRAM_NAME}"
 CHECK_PATH="${TMP_DIR}/build/check"
 GEN_PATH="${TMP_DIR}/build/generate"
 FILES_PATH="${TMP_DIR}/files.json"
-PID_PATH="${TMP_DIR}/pid.pid"
+PID_PATH="${TMP_DIR}"
 
 # Exit in case of error
 set -e
@@ -26,7 +26,7 @@ function test_CNETCAM_sort() {
   $GEN_PATH "$DATA_DIR" "$FILES_PATH"
 
   # Execute it
-  $BUILD_PATH -from "$DATA_DIR" -to "$SORT_DIR" -pid "$PID_PATH"
+  $BUILD_PATH -from "$DATA_DIR" -to "$SORT_DIR" -pid-directory "$PID_PATH"
 
   # Execute test for checking it
   $CHECK_PATH "$SORT_DIR" "$FILES_PATH"

diff --git a/test/OWIPCAM4X_fetchImage/test.sh b/test/OWIPCAM4X_fetchImage/test.sh
@@ -6,7 +6,7 @@ DATA_DIR="${TMP_DIR}/data"
 BUILD_PATH="${TMP_DIR}/build/${PROGRAM_NAME}"
 CHECK_PATH="${TMP_DIR}/build/check"
 SERVER_PATH="${TMP_DIR}/build/server"
-PID_PATH="${TMP_DIR}/pid.pid"
+PID_PATH="${TMP_DIR}"
 URL_PATH="${TMP_DIR}/url.txt"
 
 # Exit in case of error
@@ -27,9 +27,9 @@ function test_OWIPCAM4X_fetchImage() {
   sleep 1
 
   # Execute it
-  $BUILD_PATH -camera-name "CamName" -user "USER" -password "PASS" -url "$(cat $URL_PATH)/auto.jpg" -path "$DATA_DIR" -pid "$PID_PATH" &
+  $BUILD_PATH -camera-name "CamName" -user "USER" -password "PASS" -url "$(cat $URL_PATH)/auto.jpg" -path "$DATA_DIR" -pid-directory "$PID_PATH" &
   sleep 10
-  kill -SIGINT "$(cat $PID_PATH)"
+  kill -SIGINT "$(cat ${PID_PATH}/OWIPCAM4X_fetchImage_CamName.pid)"
   kill -SIGINT "$SERVER_PID"
 
   # Execute test for checking it