Updates to get test-harness working with updates

qa/test-harness/full-test.sh

@@ -1,18 +1,18 @@
 #!/bin/sh
 echo "[FULL TEST] Starting all tests..."
 echo "====="
-python test-harness.py --config-file config/bsmLogDuringEvent.ini --data-file ../data/bsmLogDuringEvent.gz --kafka-topic topic.OdeBsmJson --output-file results_bsmLogDuringEvent.log
+python test-harness.py --config-file config/bsmLogDuringEvent.ini --data-file ../../data/bsmLogDuringEvent.gz --kafka-topic topic.OdeBsmJson --output-file results_bsmLogDuringEvent.log
 echo "====="
-python test-harness.py --config-file config/bsmTx.ini --data-file ../data/bsmTx.gz --kafka-topic topic.OdeBsmJson --output-file results_bsmTx.log
+python test-harness.py --config-file config/bsmTx.ini --data-file ../../data/bsmTx.gz --kafka-topic topic.OdeBsmJson --output-file results_bsmTx.log
 echo "====="
-python test-harness.py --config-file config/driverAlert.ini --data-file ../data/driverAlert.gz --kafka-topic topic.OdeDriverAlertJson --output-file results_driverAlert.log
+python test-harness.py --config-file config/driverAlert.ini --data-file ../../data/driverAlert.gz --kafka-topic topic.OdeDriverAlertJson --output-file results_driverAlert.log
 echo "====="
-python test-harness.py --config-file config/rxMsg_TIM_GeneratedBy_TMC_VIA_SNMP-bsmcheck.ini --data-file ../data/rxMsg_TIM_GeneratedBy_TMC_VIA_SNMP.gz --kafka-topic topic.OdeBsmJson --output-file results_rxMsg_TIM_GeneratedBy_TMC_VIA_SNMP_bsmcheck.log
+python test-harness.py --config-file config/rxMsg_TIM_GeneratedBy_TMC_VIA_SNMP-bsmcheck.ini --data-file ../../data/rxMsg_TIM_GeneratedBy_TMC_VIA_SNMP.gz --kafka-topic topic.OdeBsmJson --output-file results_rxMsg_TIM_GeneratedBy_TMC_VIA_SNMP_bsmcheck.log
 echo "====="
-python test-harness.py --config-file config/rxMsg_TIM_GeneratedBy_TMC_VIA_SNMP-timcheck.ini --data-file ../data/rxMsg_TIM_GeneratedBy_TMC_VIA_SNMP.gz --kafka-topic topic.OdeTimRxJson --output-file results_rxMsg_TIM_GeneratedBy_TMC_VIA_SNMP_timcheck.log
+python test-harness.py --config-file config/rxMsg_TIM_GeneratedBy_TMC_VIA_SNMP-timcheck.ini --data-file ../../data/rxMsg_TIM_GeneratedBy_TMC_VIA_SNMP.gz --kafka-topic topic.OdeTimRxJson --output-file results_rxMsg_TIM_GeneratedBy_TMC_VIA_SNMP_timcheck.log
 echo "====="
-python test-harness.py --config-file config/rxMsg_TIM_and_BSM-bsmcheck.ini --data-file ../data/rxMsg_BSM_and_TIM.gz --kafka-topic topic.OdeBsmJson --output-file results_rxMsg_TIM_and_BSM_bsmcheck.log
+python test-harness.py --config-file config/rxMsg_TIM_and_BSM-bsmcheck.ini --data-file ../../data/rxMsg_BSM_and_TIM.gz --kafka-topic topic.OdeBsmJson --output-file results_rxMsg_TIM_and_BSM_bsmcheck.log
 echo "====="
-python test-harness.py --config-file config/rxMsg_TIM_and_BSM-timcheck.ini --data-file ../data/rxMsg_BSM_and_TIM.gz --kafka-topic topic.OdeTimRxJson --output-file results_rxMsg_TIM_and_BSM_timcheck.log
+python test-harness.py --config-file config/rxMsg_TIM_and_BSM-timcheck.ini --data-file ../../data/rxMsg_BSM_and_TIM.gz --kafka-topic topic.OdeTimRxJson --output-file results_rxMsg_TIM_and_BSM_timcheck.log
 echo "====="
 echo "[FULL TEST] Testing complete."

qa/test-harness/test-harness.py

@@ -75,6 +75,10 @@ def main():
  kafkaListenerThread.join()
  print("[INFO] Received %d messages from Kafka consumer." % msg_queue.qsize())
 
+ if msg_queue.qsize() == 0:
+ print("[ERROR] Aborting test routine! Received no messages from the Kafka consumer.")
+ return
+
  # After all messages were received, log them to a file
  validation_results = validator.validate_queue(msg_queue)