hardcoresushi/libcryfs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Don't block if filesystem doesn't finish

Browse Source
This commit is contained in:
Sebastian Messmer 2018-09-08 03:32:46 -07:00
parent afad6ee465
commit 1be1b5c26e
1 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
test/cryfs-cli/testutils/CliTest.h
View File

@ -83,11 +83,10 @@ public:
}; };
FilesystemOutput _run_filesystem(const std::vector<std::string>& args, const boost::optional<boost::filesystem::path>& mountDirForUnmounting) { FilesystemOutput _run_filesystem(const std::vector<std::string>& args, const boost::optional<boost::filesystem::path>& mountDirForUnmounting) {
std::future<FilesystemOutput> filesystem_output = std::async(std::launch::async, [this, &args] {
testing::internal::CaptureStdout(); testing::internal::CaptureStdout();
testing::internal::CaptureStderr(); testing::internal::CaptureStderr();
int exit_code = run(args); std::future<int> exit_code = std::async(std::launch::async, [this, &args] {
return FilesystemOutput {exit_code, testing::internal::GetCapturedStdout(), testing::internal::GetCapturedStderr()}; return run(args);
}); });
if (mountDirForUnmounting.is_initialized()) { if (mountDirForUnmounting.is_initialized()) {
@ -111,16 +110,32 @@ public:
}); });
if(std::future_status::ready != unmount_success.wait_for(std::chrono::seconds(10))) { if(std::future_status::ready != unmount_success.wait_for(std::chrono::seconds(10))) {
throw std::runtime_error("Unmount thread didn't finish"); testing::internal::GetCapturedStdout(); // stop capturing stdout
testing::internal::GetCapturedStderr(); // stop capturing stderr
std::cerr << "Unmount thread didn't finish";
// The std::future destructor of a future created with std::async blocks until the future is ready.
// so, instead of causing a deadlock, rather abort
exit(EXIT_FAILURE);
} }
EXPECT_TRUE(unmount_success.get()); // this also re-throws any potential exceptions EXPECT_TRUE(unmount_success.get()); // this also re-throws any potential exceptions
} }
if(std::future_status::ready != filesystem_output.wait_for(std::chrono::seconds(10))) { if(std::future_status::ready != exit_code.wait_for(std::chrono::seconds(10))) {
throw std::runtime_error("Filesystem thread didn't finish"); testing::internal::GetCapturedStdout(); // stop capturing stdout
testing::internal::GetCapturedStderr(); // stop capturing stderr
std::cerr << "Filesystem thread didn't finish";
// The std::future destructor of a future created with std::async blocks until the future is ready.
// so, instead of causing a deadlock, rather abort
exit(EXIT_FAILURE);
} }
return filesystem_output.get(); return {
exit_code.get(),
testing::internal::GetCapturedStdout(),
testing::internal::GetCapturedStderr()
};
} }
}; };