From 833068e3c2cb67e866320e4cabdaddbf126b3664 Mon Sep 17 00:00:00 2001
From: Martin Killenberg <martin.killenberg@desy.de>
Date: Mon, 3 Feb 2020 19:17:33 +0100
Subject: [PATCH] solved a race condition in testTrigger. Initial value was not
considered. Still race conditions remaining.
---
tests/executables_src/testTrigger.cc | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/tests/executables_src/testTrigger.cc b/tests/executables_src/testTrigger.cc
index 10925f57..892bb175 100644
--- a/tests/executables_src/testTrigger.cc
+++ b/tests/executables_src/testTrigger.cc
@@ -316,9 +316,12 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(testTriggerTransferGroup, T, test_types) {
dev.write("/REG2", 22);
dev.write("/REG3", 33);
+ // from the inital value transfer
+ CHECK_TIMEOUT(backend->numberOfTransfers == 1, 10000);
+
// trigger the transfer
app.testModule.theTrigger.write();
- CHECK_TIMEOUT(backend->numberOfTransfers == 1, 10000);
+ CHECK_TIMEOUT(backend->numberOfTransfers == 2, 10000);
BOOST_CHECK(backend->last_bar == 0);
BOOST_CHECK(backend->last_address == 0);
BOOST_CHECK(backend->last_sizeInBytes == 12);
@@ -327,9 +330,9 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(testTriggerTransferGroup, T, test_types) {
app.testModule.consumingPush.read();
app.testModule.consumingPush2.read();
app.testModule.consumingPush3.read();
- BOOST_CHECK(app.testModule.consumingPush == 11);
- BOOST_CHECK(app.testModule.consumingPush2 == 22);
- BOOST_CHECK(app.testModule.consumingPush3 == 33);
+ BOOST_CHECK_EQUAL(app.testModule.consumingPush, 11);
+ BOOST_CHECK_EQUAL(app.testModule.consumingPush2, 22);
+ BOOST_CHECK_EQUAL(app.testModule.consumingPush3, 33);
// prepare a second transfer
dev.write("/REG1", 12);
@@ -338,7 +341,7 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(testTriggerTransferGroup, T, test_types) {
// trigger the transfer
app.testModule.theTrigger.write();
- CHECK_TIMEOUT(backend->numberOfTransfers == 2, 10000);
+ CHECK_TIMEOUT(backend->numberOfTransfers == 3, 10000);
BOOST_CHECK(backend->last_bar == 0);
BOOST_CHECK(backend->last_address == 0);
BOOST_CHECK(backend->last_sizeInBytes == 12);
@@ -347,9 +350,9 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(testTriggerTransferGroup, T, test_types) {
app.testModule.consumingPush.read();
app.testModule.consumingPush2.read();
app.testModule.consumingPush3.read();
- BOOST_CHECK(app.testModule.consumingPush == 12);
- BOOST_CHECK(app.testModule.consumingPush2 == 23);
- BOOST_CHECK(app.testModule.consumingPush3 == 34);
+ BOOST_CHECK_EQUAL(app.testModule.consumingPush, 12);
+ BOOST_CHECK_EQUAL(app.testModule.consumingPush2, 23);
+ BOOST_CHECK_EQUAL(app.testModule.consumingPush3, 34);
dev.close();
}
--
GitLab