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.

SubSystems/Online_Cobalt/test/tProductionParsets.run

-#!/bin/bash
-#
-# Test whether all parsets in tProductionParsets.in_parsets
-# are accepted by runObservation.sh. Does not:
-#
-#   * process blocks
-#   * read input from stations
-#   * write output
-#
-# Note: production parsets are stored by OnlineControl as
-#       /opt/lofar/var/run/CorrProc_$OBSID.param
-
-. ./testFuncs.sh
-
-# The directory containing the parsets to test
-PARSETDIR=tProductionParsets.in_parsets
-
-# Copy extra parsets to test
-cp $srcdir/default.parset $PARSETDIR
-
-for PARSET in $PARSETDIR/*
-do
-  echo "****** Testing parset `basename "$PARSET"` ******"
-
-  # Reduce the run time to zero
-  echo "Observation.startTime = 2013-01-01 00:00:00" >> $PARSET
-  echo "Observation.stopTime  = 2013-01-01 00:00:00" >> $PARSET
-
-  # Prevent input from being read
-  sed -i 's/RSP.sources = .*/RSP.sources = [4*null:]/' $PARSET
-
-  # Prevent output from being written
-  echo "Observation.DataProducts.Output_Correlated.filenames=[488*/dev/null]" >> $PARSET
-  echo "Observation.DataProducts.Output_Correlated.locations=[488*:.]" >> $PARSET
-  echo "Observation.DataProducts.Output_Beamformed.filenames=[500*/dev/null]" >> $PARSET
-  echo "Observation.DataProducts.Output_Beamformed.locations=[500*:.]" >> $PARSET
-
-  # Run the observation (do NOT throw alarms for running past observations)
-  timeout 300s runObservation.sh -B -C -F -l 1 -x COBALT_NO_ALARM=1 $PARSET
-  OBSRESULT=$?
-
-  if [ $OBSRESULT -gt 0 ]; then
-    exit $OBSRESULT
-  fi
-done
-
-# Everything went ok
-exit 0
-

SubSystems/Online_Cobalt/test/tProductionParsets.sh

-#!/bin/sh
-./runctest.sh tProductionParsets

SubSystems/Online_Cobalt/test/tStatusFeedback.run2.in

@@ -34,7 +34,7 @@ function test_parset {
 }
 
 test_parset $PWD/tStatusFeedback.in_parset_success_1 0 ""
-test_parset $PWD/tStatusFeedback.in_parset_failure_1 1 "-o Cobalt.Nodes=[unreachable]"
+test_parset $PWD/tStatusFeedback.in_parset_failure_1 255 "-o Cobalt.Nodes=[unreachable]"
 
 # Everything went ok
 exit 0