(CI): minor fixes in tests

.gitlab-ci.yml

@@ -10,7 +10,7 @@ build and test:
   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
+    - daas rpmbuild p8 --use-ccache --ccache ${CI_PROJECT_DIR}/ccache 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_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 1000 --mbtcp-timeout 2500 --mbtcp-ignore-timeout 2500 --dlog-add-levels warn,crit
 # --dlog-add-levels any
 #--mbtcp-force-out 1
 #--dlog-add-levels any

extensions/ModbusMaster/tests/test_mbtcpmaster.cc

@@ -174,13 +174,13 @@ TEST_CASE("MBTCPMaster: 0x01 (read coil status)", "[modbus][0x01][mbmaster][mbtc
 
 	CHECK( ui->isExist(mbID) );
 	mbs->setReply(65535);
-	msleep(polltime + 200);
+	msleep(polltime + 250);
 	REQUIRE( ui->getValue(1000) == 1 );
 	REQUIRE( ui->getValue(1001) == 1 );
 	REQUIRE( ui->getValue(1002) == 1 );
 
 	mbs->setReply(0);
-	msleep(polltime + 200);
+	msleep(polltime + 250);
 	REQUIRE( ui->getValue(1000) == 0 );
 	REQUIRE( ui->getValue(1001) == 0 );
 	REQUIRE( ui->getValue(1002) == 0 );

extensions/ModbusMaster/tests/test_mbtcpmultimaster.cc

@@ -79,7 +79,7 @@ static void InitTest()
 			msleep(200);
 
 		CHECK( mbs1->isRunning() );
-		msleep(7000);
+		msleep(7300);
 		CHECK( ui->getValue(slaveNotRespond) == 0 );
 	}
 

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() );
 }
 // -----------------------------------------------------------------------------