(CI): minor fixes in tests (for tests in docker)

.gitlab-ci.yml

@@ -9,8 +9,6 @@ build and test:
   stage: build
   script:
     - daas rpmbuild sisyphus --use-ccache --ccache ${CI_PROJECT_DIR}/ccache uniset-check.sh
-    - git clean -dxf
-    - daas rpmbuild --use-ccache --ccache ${CI_PROJECT_DIR}/ccache p8 uniset-check.sh
   after_script:
     - mkdir -p ${CI_PROJECT_DIR}/${ARTIFACTS_PATH}
     - cp -ar ${CI_PROJECT_DIR}/testsuite ${CI_PROJECT_DIR}/${ARTIFACTS_PATH}/

extensions/ModbusMaster/tests/run_test_mbtcpmaster.sh

@@ -15,7 +15,7 @@ cd -
 --mbtcp-filter-value 1 \
 --mbtcp-gateway-iaddr localhost \
 --mbtcp-gateway-port 20048 \
---mbtcp-polltime 50 --mbtcp-recv-timeout 500 
+--mbtcp-polltime 50 --mbtcp-recv-timeout 200 
 #--mbtcp-log-add-levels any
 #--mbtcp-default-mbinit-ok 1
 #--dlog-add-levels any

extensions/ModbusMaster/tests/run_test_mbtcpmultimaster.sh

@@ -13,7 +13,7 @@ cd -
 --smemory-id SharedMemory \
 --mbtcp-filter-field mb \
 --mbtcp-filter-value 1 \
---mbtcp-polltime 50 --mbtcp-recv-timeout 500 --mbtcp-checktime 1000 --mbtcp-timeout 3000 --mbtcp-ignore-timeout 3000 --dlog-add-levels warn,crit
+--mbtcp-polltime 50 --mbtcp-recv-timeout 500 --mbtcp-checktime 500 --mbtcp-timeout 2500 --mbtcp-ignore-timeout 2500 --dlog-add-levels warn,crit
 # --dlog-add-levels any
 #--mbtcp-force-out 1
 #--dlog-add-levels any

tests/test_delaytimer.cc

@@ -183,9 +183,9 @@ TEST_CASE("[DelayTimer]: zero time", "[DelayTimer]" )
 		msleep(40);
 		CHECK_FALSE( dt.check(false) );
 		CHECK_FALSE( dt.check(true) );
-		msleep(80);
+		msleep(70);
 		CHECK_FALSE( dt.check(true) );
-		msleep(40);
+		msleep(50);
 		CHECK( dt.check(true) );
 	}
 

tests/test_passivetimer.cc

@@ -91,10 +91,10 @@ TEST_CASE("PassiveTimer: 1 msec", "[PassiveTimer][msec]" )
 	msleep(1);
 	CHECK( pt.checkTime() );
 
-	pt.setTiming(2);
+	pt.setTiming(3);
 	msleep(1);
 	CHECK_FALSE( pt.checkTime() );
-	msleep(1);
+	msleep(2);
 	CHECK( pt.checkTime() );
 }
 // -----------------------------------------------------------------------------