[QC-297] Fix testWorkflow (#407)

Author: knopers8

Framework/CMakeLists.txt

@@ -298,9 +298,9 @@ endforeach()
 target_include_directories(testVersion PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>)
 target_include_directories(testCcdbDatabase PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>)
 
-set_property(TEST testWorkflow PROPERTY TIMEOUT 10)
+set_property(TEST testWorkflow PROPERTY TIMEOUT 20)
 set_property(TEST testWorkflow PROPERTY LABELS slow)
-set_property(TEST testCheckWorkflow PROPERTY TIMEOUT 10)
+set_property(TEST testCheckWorkflow PROPERTY TIMEOUT 20)
 set_property(TEST testCheckWorkflow PROPERTY LABELS slow)
 set_property(TEST testObjectsManager PROPERTY TIMEOUT 20)
 set_property(TEST testObjectsManager PROPERTY LABELS slow)

Framework/include/QualityControl/runnerUtils.h

@@ -41,13 +41,13 @@ std::string getFirstTaskName(std::string configurationSource)
   throw;
 }
 
-std::string getFirstCheckerName(std::string configurationSource)
+std::string getFirstCheckName(std::string configurationSource)
 {
   auto config = o2::configuration::ConfigurationFactory::getConfiguration(configurationSource);
 
   if (config->getRecursive("qc").count("checks")) {
-    for (const auto& task : config->getRecursive("qc.checks")) {
-      return task.first; // task name;
+    for (const auto& check : config->getRecursive("qc.checks")) {
+      return check.first; // check name;
     }
   }
 

Framework/src/runBasic.cxx

@@ -104,7 +104,7 @@ WorkflowSpec defineDataProcessing(const ConfigContext& config)
     DataProcessorSpec printer{
       "printer",
       Inputs{
-        { "checked-mo", "QC", CheckRunner::createCheckRunnerDataDescription(getFirstCheckerName(qcConfigurationSource)), 0 } },
+        { "checked-mo", "QC", CheckRunner::createCheckRunnerDataDescription(getFirstCheckName(qcConfigurationSource)), 0 } },
       Outputs{},
       adaptFromTask<o2::quality_control::example::ExampleQualityPrinterSpec>()
     };

Framework/test/testWorkflow.cxx

@@ -13,17 +13,25 @@
 /// \author  Piotr Konopka
 ///
 
+#include "QualityControl/InfrastructureGenerator.h"
+#include <Framework/DataSampling.h>
+
+using namespace o2;
+using namespace o2::framework;
+
+void customize(std::vector<CompletionPolicy>& policies)
+{
+  DataSampling::CustomizeInfrastructure(policies);
+  quality_control::customizeInfrastructure(policies);
+}
+
 #include "getTestDataDirectory.h"
 #include "QualityControl/CheckRunner.h"
-#include "QualityControl/InfrastructureGenerator.h"
 #include "QualityControl/runnerUtils.h"
 #include <Framework/runDataProcessing.h>
 #include <Framework/ControlService.h>
-#include <Framework/DataSampling.h>
 #include <TH1F.h>
 
-using namespace o2;
-using namespace o2::framework;
 using namespace o2::quality_control::core;
 using namespace o2::quality_control::checker;
 
@@ -53,13 +61,13 @@ WorkflowSpec defineDataProcessing(ConfigContext const&)
   DataSampling::GenerateInfrastructure(specs, qcConfigurationSource);
 
   // Generation of the QC topology (one task, one checker in this case)
-  quality_control::generateRemoteInfrastructure(specs, qcConfigurationSource);
+  quality_control::generateStandaloneInfrastructure(specs, qcConfigurationSource);
 
   // Finally the receiver
   DataProcessorSpec receiver{
     "receiver",
     Inputs{
-      { "checked-mo", "QC", CheckRunner::createCheckRunnerDataDescription(getFirstCheckerName(qcConfigurationSource)), 0 } },
+      { "checked-mo", "QC", CheckRunner::createCheckRunnerDataDescription(getFirstCheckName(qcConfigurationSource)), 0 } },
     Outputs{},
     AlgorithmSpec{
       [](ProcessingContext& pctx) {
@@ -68,14 +76,14 @@ WorkflowSpec defineDataProcessing(ConfigContext const&)
         auto qo = pctx.inputs().get<QualityObject*>("checked-mo");
         if (!qo) {
           LOG(ERROR) << "Quality Object is a NULL";
-          pctx.services().get<ControlService>().readyToQuit(true);
+          pctx.services().get<ControlService>().readyToQuit(QuitRequest::All);
           return;
         }
 
-        LOG(DEBUG) << qo->getName() << " - qualit: " << qo->getQuality();
+        LOG(DEBUG) << qo->getName() << " - quality: " << qo->getQuality();
 
         // We ask to shut the topology down, returning 0 if there were no ERROR logs.
-        pctx.services().get<ControlService>().readyToQuit(true);
+        pctx.services().get<ControlService>().readyToQuit(QuitRequest::All);
       } }
   };
   specs.push_back(receiver);

Modules/TOF/src/runTOF.cxx

@@ -96,7 +96,7 @@ WorkflowSpec defineDataProcessing(const ConfigContext& config)
   DataProcessorSpec printer{
     "printer",
     Inputs{
-      { "checked-mo", "QC", CheckRunner::createCheckRunnerDataDescription(getFirstCheckerName(qcConfigurationSource)), 0 } },
+      { "checked-mo", "QC", CheckRunner::createCheckRunnerDataDescription(getFirstCheckName(qcConfigurationSource)), 0 } },
     Outputs{},
     adaptFromTask<o2::quality_control::example::ExampleQualityPrinterSpec>()
   };