Mirror/FairMQ
1
0
Fork 0
mirror of https://github.com/FairRootGroup/FairMQ.git synced 2025-10-15 01:26:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use process tools for WaitFor test

Browse Source
This commit is contained in:
Alexey Rybalchenko
2019-03-19 16:34:51 +01:00
committed by Dennis Klein
parent 6809d60fad
commit 99ffb732f4
5 changed files with 70 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fairmq/plugins/Control.cxx
View File

@@ -189,7 +189,7 @@ try {
bool keepRunning = true;
while (keepRunning) {
if (poll(cinfd, 1, 500)) {
if (poll(cinfd, 1, 100)) {
if (fDeviceShutdownRequested) {
break;
}

77
test/device/_waitfor.cxx
View File

@@ -9,66 +9,65 @@
#include "runner.h"
#include <gtest/gtest.h>
#include <boost/process.hpp>
#include <fairmq/Tools.h>
#include <sys/types.h>
#include <signal.h>
#include <signal.h> // kill
#include <string>
#include <thread>
#include <chrono>
#include <iostream>
#include <future> // std::async, std::future
namespace
{
using namespace std;
using namespace fair::mq::test;
using namespace fair::mq::tools;
void RunWaitFor()
void RunWaitFor(const string& state, const string& control)
{
std::mutex mtx;
std::condition_variable cv;
int pid = 0;
int exit_code = 0;
thread deviceThread([&]() {
execute_result result;
thread device_thread([&] {
stringstream cmd;
cmd << runTestDevice << " --id waitfor_" << " --control static " << " --severity nolog";
boost::process::ipstream stdout;
boost::process::child c(cmd.str(), boost::process::std_out > stdout);
string line;
getline(stdout, line);
{
std::lock_guard<std::mutex> lock(mtx);
pid = c.id();
}
cv.notify_one();
c.wait();
exit_code = c.exit_code();
cmd << runTestDevice
<< " --id waitfor_" << state
<< " --control " << control
<< " --session " << UuidHash()
<< " --severity debug"
<< " --color false";
result = execute(cmd.str(), "[WaitFor]", "", SIGINT);
});
{
std::unique_lock<std::mutex> lock(mtx);
cv.wait(lock, [&pid]{ return pid != 0; });
}
device_thread.join();
kill(pid, SIGINT);
ASSERT_NE(string::npos, result.console_out.find("Sleeping Done. Interrupted."));
deviceThread.join();
exit(exit_code);
exit(result.exit_code);
}
TEST(Device, WaitFor)
TEST(WaitFor, static_InPreRun)
{
EXPECT_EXIT(RunWaitFor(), ::testing::ExitedWithCode(0), "");
EXPECT_EXIT(RunWaitFor("PreRun", "static"), ::testing::ExitedWithCode(0), "");
}
TEST(WaitFor, static_InRun)
{
EXPECT_EXIT(RunWaitFor("Run", "static"), ::testing::ExitedWithCode(0), "");
}
TEST(WaitFor, static_InPostRun)
{
EXPECT_EXIT(RunWaitFor("PostRun", "static"), ::testing::ExitedWithCode(0), "");
}
TEST(WaitFor, interactive_InPreRun)
{
EXPECT_EXIT(RunWaitFor("PreRun", "interactive"), ::testing::ExitedWithCode(0), "");
}
TEST(WaitFor, interactive_InRun)
{
EXPECT_EXIT(RunWaitFor("Run", "interactive"), ::testing::ExitedWithCode(0), "");
}
TEST(WaitFor, interactive_InPostRun)
{
EXPECT_EXIT(RunWaitFor("PostRun", "interactive"), ::testing::ExitedWithCode(0), "");
}
} // namespace

2
test/helper/devices/TestErrorState.h
View File

@@ -32,6 +32,7 @@ class ErrorState : public FairMQDevice
ChangeState(fair::mq::Transition::ErrorFound);
}
}
void Bind() override
{
std::string state("Bind");
@@ -40,6 +41,7 @@ class ErrorState : public FairMQDevice
ChangeState(fair::mq::Transition::ErrorFound);
}
}
void Connect() override
{
std::string state("Connect");

2
test/helper/devices/TestExceptions.h
View File

@@ -32,6 +32,7 @@ class Exceptions : public FairMQDevice
throw std::runtime_error("exception in " + state + "()");
}
}
auto Bind() -> void override
{
std::string state("Bind");
@@ -39,6 +40,7 @@ class Exceptions : public FairMQDevice
throw std::runtime_error("exception in " + state + "()");
}
}
auto Connect() -> void override
{
std::string state("Connect");

30
test/helper/devices/TestWaitFor.h
View File

@@ -24,10 +24,34 @@ namespace test
class TestWaitFor : public FairMQDevice
{
public:
void Run()
void PreRun() override
{
std::cout << "hello" << std::endl;
WaitFor(std::chrono::seconds(60));
std::string state("PreRun");
if (std::string::npos != GetId().find("_" + state)) {
LOG(info) << "Going to sleep via WaitFor() in " << state << "...";
bool result = WaitFor(std::chrono::seconds(60));
LOG(info) << (result == true ? "Sleeping Done. Not interrupted." : "Sleeping Done. Interrupted.");
}
}
void Run() override
{
std::string state("Run");
if (std::string::npos != GetId().find("_" + state)) {
LOG(info) << "Going to sleep via WaitFor() in " << state << "...";
bool result = WaitFor(std::chrono::seconds(60));
LOG(info) << (result == true ? "Sleeping Done. Not interrupted." : "Sleeping Done. Interrupted.");
}
}
void PostRun() override
{
std::string state("PostRun");
if (std::string::npos != GetId().find("_" + state)) {
LOG(info) << "Going to sleep via WaitFor() in " << state << "...";
bool result = WaitFor(std::chrono::seconds(60));
LOG(info) << (result == true ? "Sleeping Done. Not interrupted." : "Sleeping Done. Interrupted.");
}
}
};