Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ensure Logger tests aren't run in parallel #1277

Merged
merged 5 commits into from
May 31, 2023
Merged

Ensure Logger tests aren't run in parallel #1277

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9dee913
Ensure Logger tests aren't run in parallel
robertmaynard May 30, 2023
0aba763
Revert "Ensure Logger tests aren't run in parallel"
robertmaynard May 31, 2023
8829878
Ensure logger tests can be run in parallel
robertmaynard May 31, 2023
a03cf83
Correct style issues found by CI
robertmaynard May 31, 2023
5b4fe70
Correct style issues found by CI
robertmaynard May 31, 2023
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
43 changes: 37 additions & 6 deletions tests/logger_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
#include <gmock/gmock.h>
#include <gtest/gtest.h>

#include <cstdlib>
#include <filesystem>
#include <thread>

namespace rmm::test {
Expand Down Expand Up @@ -59,6 +61,30 @@ class raii_restore_env {
bool is_set_{false};
};

class raii_temp_directory {
public:
raii_temp_directory()
{
directory_path_ = std::filesystem::temp_directory_path();
std::string unique_dir_name = "rmm_XXXXXX";
auto const ptr = mkdtemp(const_cast<char*>(unique_dir_name.data()));
EXPECT_TRUE((ptr != nullptr));
directory_path_ /= unique_dir_name;
}
~raii_temp_directory() { std::filesystem::remove_all(directory_path_); }

raii_temp_directory& operator=(raii_temp_directory const&) = delete;
raii_temp_directory(raii_temp_directory const&) = delete;

[[nodiscard]] std::string generate_path(std::string filename) const
{
return directory_path_ / filename;
}

private:
std::filesystem::path directory_path_{};
};

/**
* @brief Verifies the specified log file contains the expected events.
*
Expand Down Expand Up @@ -95,7 +121,8 @@ void expect_log_events(std::string const& filename,

TEST(Adaptor, FilenameConstructor)
{
std::string filename{"logs/test1.txt"};
raii_temp_directory temp_dir;
std::string filename{temp_dir.generate_path("test.txt")};
rmm::mr::cuda_memory_resource upstream;
rmm::mr::logging_resource_adaptor<rmm::mr::cuda_memory_resource> log_mr{&upstream, filename};

Expand All @@ -121,8 +148,9 @@ TEST(Adaptor, FilenameConstructor)

TEST(Adaptor, MultiSinkConstructor)
{
std::string filename1{"logs/test_multi_1.txt"};
std::string filename2{"logs/test_multi_2.txt"};
raii_temp_directory temp_dir;
std::string filename1{temp_dir.generate_path("test_multi_1.txt")};
std::string filename2{temp_dir.generate_path("test_multi_2.txt")};
rmm::mr::cuda_memory_resource upstream;

auto file_sink1 = std::make_shared<spdlog::sinks::basic_file_sink_mt>(filename1, true);
Expand Down Expand Up @@ -154,7 +182,8 @@ TEST(Adaptor, MultiSinkConstructor)

TEST(Adaptor, Factory)
{
std::string filename{"logs/test2.txt"};
raii_temp_directory temp_dir;
std::string filename{temp_dir.generate_path("test.txt")};
rmm::mr::cuda_memory_resource upstream;

auto log_mr = rmm::mr::make_logging_adaptor(&upstream, filename);
Expand All @@ -181,6 +210,7 @@ TEST(Adaptor, Factory)

TEST(Adaptor, EnvironmentPath)
{
raii_temp_directory temp_dir;
rmm::mr::cuda_memory_resource upstream;

// restore the original value (or unset) after test
Expand All @@ -191,7 +221,7 @@ TEST(Adaptor, EnvironmentPath)
// expect logging adaptor to fail if RMM_LOG_FILE is unset
EXPECT_THROW(rmm::mr::make_logging_adaptor(&upstream), rmm::logic_error);

std::string filename("logs/envtest.txt");
std::string filename{temp_dir.generate_path("test.txt")};

setenv("RMM_LOG_FILE", filename.c_str(), 1);

Expand All @@ -218,7 +248,8 @@ TEST(Adaptor, EnvironmentPath)

TEST(Adaptor, AllocateFailure)
{
std::string filename{"logs/failure.txt"};
raii_temp_directory temp_dir;
std::string filename{temp_dir.generate_path("failure.txt")};
rmm::mr::cuda_memory_resource upstream;

auto log_mr = rmm::mr::make_logging_adaptor(&upstream, filename);
Expand Down