Skip to content
Snippets Groups Projects
Commit 4083ddd5 authored by Jorge Camarero Vera's avatar Jorge Camarero Vera
Browse files

Fix broken test after issue #48

parent e6ecdac0
No related branches found
No related tags found
No related merge requests found
......@@ -58,7 +58,8 @@ TEST(cta_taped, InvocationTests) {
ctaConf.stringAppend(tpConfig.path());
cta::threading::SubProcess spNoDrive("cta-taped", std::list<std::string>({"cta-taped", "-f", "-s", "-c", ctaConf.path()}));
spNoDrive.wait();
ASSERT_NE(std::string::npos, spNoDrive.stdout().find("MSG=\"Aborting cta-taped on uncaught exception. Stack trace follows.\" Message=\"No drive found in configuration\""));
ASSERT_NE(std::string::npos, spNoDrive.stdout().find("MSG=\"Aborting cta-taped. Not starting because: "
"No drive found in configuration\""));
ASSERT_TRUE(spNoDrive.stderr().empty());
ASSERT_EQ(EXIT_FAILURE, spNoDrive.exitValue());
}
......
......@@ -53,7 +53,7 @@ int TapeDaemon::main() {
exceptionThrowingMain();
} catch (cta::exception::NoSuchObject &ex) {
m_log(log::ERR, "Aborting cta-taped. Not starting because: " + ex.getMessage().str());
return 2;
return 1;
} catch (cta::exception::Exception &ex) {
// Log the error
m_log(log::ERR, "Aborting cta-taped on uncaught exception. Stack trace follows.", {{"Message", ex.getMessage().str()}});
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment