Skip to content
Snippets Groups Projects
Commit 0309e3f7 authored by Jorrit Schaap's avatar Jorrit Schaap Committed by Auke Klazema
Browse files

COB-69: Merge branch 'COB-69-fix-tests' into 'master'

COB-69: Fix COBALT2 tests

Closes COB-69

See merge request !54

(cherry picked from commit dc8e4fe3)

bfefba62 COB-69: Accept integration test output for COBALT2 after formal commissioning
16fabff0 COB-69: Accept new output for station streams after adding LV614.
50d951bf COB-69: Queue names changed from lofar to otdb prefix, fixed tests accordingly.
e0ac1e0a COB-69: Failed test returns different error code on COBALT2. Adjust test accordingly.
2ea72918 COB-69: Use updated queue names for comparing against golden output.
82361bad COB-69: Use parset filename for tests that more closely mimics those in...
f70c663a COB-69: Removed test that was always blinking and kind of ill conceived.
parent 1e830d81
No related branches found
No related tags found
2 merge requests!59Merge LOFAR-Release-4_0 into master,!58COB-69: Merge branch 'COB-69-fix-tests' into 'LOFAR-Release-4_0'
Showing
with 158 additions and 155 deletions
#!/bin/bash #!/bin/bash
source MessageFuncs.sh source MessageFuncs.sh
create_queue lofar.task.feedback.dataproducts create_queue otdb.task.feedback.dataproducts
# remove any output files from prev runs # remove any output files from prev runs
rm -rf tManyPartTABOutput-data/ rm -rf tManyPartTABOutput-data/
......
#!/bin/bash #!/bin/bash
source MessageFuncs.sh source MessageFuncs.sh
create_queue lofar.task.feedback.dataproducts create_queue otdb.task.feedback.dataproducts
# remove any output files from prev runs # remove any output files from prev runs
rm -f tMultiPartTABOutput-L123881_SAP000_B000_P00?_bf.h5 tMultiPartTABOutput-L123881_SAP000_B000_P00?_bf.raw rm -f tMultiPartTABOutput-L123881_SAP000_B000_P00?_bf.h5 tMultiPartTABOutput-L123881_SAP000_B000_P00?_bf.raw
......
...@@ -8,7 +8,7 @@ PID_ID=$! # get the PID ...@@ -8,7 +8,7 @@ PID_ID=$! # get the PID
source MessageFuncs.sh source MessageFuncs.sh
# Empty queues (if any) # Empty queues (if any)
create_queue lofar.task.feedback.dataproducts create_queue otdb.task.feedback.dataproducts
# Start the test # Start the test
tStorageProcesses || exit 1 tStorageProcesses || exit 1
...@@ -16,7 +16,7 @@ wait $PID_ID ...@@ -16,7 +16,7 @@ wait $PID_ID
# Validate queues # Validate queues
if have_qpid; then if have_qpid; then
recv_msg lofar.task.feedback.dataproducts > tStorageProcesses.queue recv_msg otdb.task.feedback.dataproducts > tStorageProcesses.queue
compare_msg $srcdir/tStorageProcesses.queue tStorageProcesses.queue || exit 1 compare_msg $srcdir/tStorageProcesses.queue tStorageProcesses.queue || exit 1
fi fi
......
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
...@@ -11,7 +11,6 @@ endforeach() ...@@ -11,7 +11,6 @@ endforeach()
set(_tests set(_tests
tgenerateStationStreams tgenerateStationStreams
tStatusFeedback tStatusFeedback
tProductionParsets
tstartBGL tstartBGL
) )
......
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment