From bb01f90e1f2aa3ccf537d09259c580f47313b8fd Mon Sep 17 00:00:00 2001
From: Dhanya Thattil <dhanya.thattil@psi.ch>
Date: Tue, 6 Dec 2022 10:21:45 +0100
Subject: [PATCH] fix tests to not allow setting veto stream at a single module
 level

---
 .../tests/test-CmdProxy-gotthard2.cpp            | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/slsDetectorSoftware/tests/test-CmdProxy-gotthard2.cpp b/slsDetectorSoftware/tests/test-CmdProxy-gotthard2.cpp
index ea86b483e..4ee25036e 100644
--- a/slsDetectorSoftware/tests/test-CmdProxy-gotthard2.cpp
+++ b/slsDetectorSoftware/tests/test-CmdProxy-gotthard2.cpp
@@ -33,7 +33,7 @@ TEST_CASE("timegotthard2", "[.cmd]") {
         {
             std::ostringstream oss;
             proxy.Call("exptime", {}, -1, GET, oss);
-            REQUIRE(oss.str() == "exptime 222ns\n");
+            REQUIRE(oss.str() == "exptime 221ns\n");
         }
         for (int i = 0; i != det.size(); ++i) {
             det.setExptime(prev_val[i], {i});
@@ -48,7 +48,7 @@ TEST_CASE("timegotthard2", "[.cmd]") {
         {
             std::ostringstream oss;
             proxy.Call("burstperiod", {}, -1, GET, oss);
-            REQUIRE(oss.str() == "burstperiod 222ns\n");
+            REQUIRE(oss.str() == "burstperiod 221ns\n");
         }
         for (int i = 0; i != det.size(); ++i) {
             det.setBurstPeriod(prev_val[i], {i});
@@ -63,7 +63,7 @@ TEST_CASE("timegotthard2", "[.cmd]") {
         {
             std::ostringstream oss;
             proxy.Call("delay", {}, -1, GET, oss);
-            REQUIRE(oss.str() == "delay 222ns\n");
+            REQUIRE(oss.str() == "delay 221ns\n");
         }
         for (int i = 0; i != det.size(); ++i) {
             det.setDelayAfterTrigger(prev_val[i], {i});
@@ -80,7 +80,7 @@ TEST_CASE("timegotthard2", "[.cmd]") {
         {
             std::ostringstream oss;
             proxy.Call("period", {}, -1, GET, oss);
-            REQUIRE(oss.str() == "period 222ns\n");
+            REQUIRE(oss.str() == "period 221ns\n");
         }
         for (int i = 0; i != det.size(); ++i) {
             det.setPeriod(prev_val[i], {i});
@@ -96,7 +96,7 @@ TEST_CASE("timegotthard2", "[.cmd]") {
         {
             std::ostringstream oss;
             proxy.Call("period", {}, -1, GET, oss);
-            REQUIRE(oss.str() == "period 222ns\n");
+            REQUIRE(oss.str() == "period 221ns\n");
         }
         for (int i = 0; i != det.size(); ++i) {
             det.setPeriod(prev_val[i], {i});
@@ -586,7 +586,7 @@ TEST_CASE("vetostream", "[.cmd]") {
     CmdProxy proxy(&det);
     auto det_type = det.getDetectorType().squash();
     if (det_type == defs::GOTTHARD2) {
-        auto prev_val = det.getVetoStream();
+        auto prev_val = det.getVetoStream().tsquash("inconsistent veto stream to test");
         {
             std::ostringstream oss;
             proxy.Call("vetostream", {"none"}, -1, PUT, oss);
@@ -618,9 +618,7 @@ TEST_CASE("vetostream", "[.cmd]") {
             REQUIRE(oss.str() == "vetostream lll, 10gbe\n");
         }
         REQUIRE_THROWS(proxy.Call("vetostream", {"lll", "none"}, -1, PUT));
-        for (int i = 0; i != det.size(); ++i) {
-            det.setVetoStream(prev_val[i], {i});
-        }
+        det.setVetoStream(prev_val);
     } else {
         REQUIRE_THROWS(proxy.Call("vetostream", {}, -1, GET));
         REQUIRE_THROWS(proxy.Call("vetostream", {"none"}, -1, PUT));