Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Framework/src/CheckRunner.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,8 @@ std::string CheckRunner::createCheckRunnerFacility(std::string deviceName)

std::string CheckRunner::createSinkCheckRunnerName(InputSpec input)
{
std::string name(CheckRunner::createCheckRunnerIdString() + "-sink-");
// we need a shorter name, thus we only use "qc-sink" and not "qc-check-sink"
std::string name("qc-sink-");
name += DataSpecUtils::label(input);
return name;
}
Expand Down
30 changes: 27 additions & 3 deletions Framework/test/testInfrastructureGenerator.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,15 @@ TEST_CASE("qc_factory_remote_test")
return d.name.find("qc-check") != std::string::npos &&
d.inputs.size() == 1;
});
REQUIRE(checkRunnerCount == 6);
REQUIRE(checkRunnerCount == 4);

auto checkSinkCount = std::count_if(
workflow.begin(), workflow.end(),
[](const DataProcessorSpec& d) {
return d.name.find("qc-sink") != std::string::npos &&
d.inputs.size() == 1;
});
REQUIRE(checkSinkCount == 2);

auto postprocessingTask = std::find_if(
workflow.begin(), workflow.end(),
Expand Down Expand Up @@ -272,7 +280,15 @@ TEST_CASE("qc_factory_standalone_test")
return d.name.find("qc-check") != std::string::npos &&
d.inputs.size() == 1;
});
REQUIRE(checkRunnerCount == 5);
REQUIRE(checkRunnerCount == 4);

auto checkSinkCount = std::count_if(
workflow.begin(), workflow.end(),
[](const DataProcessorSpec& d) {
return d.name.find("qc-sink") != std::string::npos &&
d.inputs.size() == 1;
});
REQUIRE(checkSinkCount == 1);

auto postprocessingTask = std::find_if(
workflow.begin(), workflow.end(),
Expand Down Expand Up @@ -411,7 +427,15 @@ TEST_CASE("qc_infrastructure_remote_batch_test")
return d.name.find("qc-check") != std::string::npos &&
d.inputs.size() == 1;
});
REQUIRE(checkRunnerCount == 6);
REQUIRE(checkRunnerCount == 4);

auto checkSinkCount = std::count_if(
workflow.begin(), workflow.end(),
[](const DataProcessorSpec& d) {
return d.name.find("qc-sink") != std::string::npos &&
d.inputs.size() == 1;
});
REQUIRE(checkSinkCount == 2);

auto postprocessingTask = std::find_if(
workflow.begin(), workflow.end(),
Expand Down