From b1c5b62557a7bb3dbae2c5614f3e9bd053c383a3 Mon Sep 17 00:00:00 2001 From: Tao Bao Date: Thu, 12 Jul 2018 11:49:05 -0700 Subject: tests: Clean up the temporary dirs post-run. TemporaryDir only deletes empty dirs (not done by its dtor because it tries to keep the temporary files available on error exit). Also change FreeCacheTest::MockFreeSpaceChecker to be static. Test: Run recovery_unit_test on marlin. Check /data/local/tmp post-run. Change-Id: I1bd54eb840e3094b4f22ee84c059eec2998773bf --- tests/unit/applypatch_test.cpp | 38 +++++++++++++++++++------------------- tests/unit/screen_ui_test.cpp | 5 +++-- 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/tests/unit/applypatch_test.cpp b/tests/unit/applypatch_test.cpp index 4b757feab..0d4123b5e 100644 --- a/tests/unit/applypatch_test.cpp +++ b/tests/unit/applypatch_test.cpp @@ -164,27 +164,37 @@ class FreeCacheTest : public ::testing::Test { return file_list; } - static void AddFilesToDir(const std::string& dir, const std::vector& files) { + void AddFilesToDir(const std::string& dir, const std::vector& files) { std::string zeros(4096, 0); for (const auto& file : files) { - std::string path = dir + "/" + file; - ASSERT_TRUE(android::base::WriteStringToFile(zeros, path)); + temporary_files_.push_back(dir + "/" + file); + ASSERT_TRUE(android::base::WriteStringToFile(zeros, temporary_files_.back())); } } void SetUp() override { Paths::Get().set_cache_log_directory(mock_log_dir.path); + temporary_files_.clear(); + } + + void TearDown() override { + for (const auto& file : temporary_files_) { + ASSERT_TRUE(android::base::RemoveFileIfExists(file)); + } } // A mock method to calculate the free space. It assumes the partition has a total size of 40960 // bytes and all files are 4096 bytes in size. - int64_t MockFreeSpaceChecker(const std::string& dirname) { + static size_t MockFreeSpaceChecker(const std::string& dirname) { std::vector files = FindFilesInDir(dirname); return PARTITION_SIZE - 4096 * files.size(); } TemporaryDir mock_cache; TemporaryDir mock_log_dir; + + private: + std::vector temporary_files_; }; TEST_F(FreeCacheTest, FreeCacheSmoke) { @@ -193,9 +203,7 @@ TEST_F(FreeCacheTest, FreeCacheSmoke) { ASSERT_EQ(files, FindFilesInDir(mock_cache.path)); ASSERT_EQ(4096 * 7, MockFreeSpaceChecker(mock_cache.path)); - ASSERT_TRUE(RemoveFilesInDirectory(4096 * 9, mock_cache.path, [this](const std::string& dir) { - return this->MockFreeSpaceChecker(dir); - })); + ASSERT_TRUE(RemoveFilesInDirectory(4096 * 9, mock_cache.path, MockFreeSpaceChecker)); ASSERT_EQ(std::vector{ "file3" }, FindFilesInDir(mock_cache.path)); ASSERT_EQ(4096 * 9, MockFreeSpaceChecker(mock_cache.path)); @@ -221,9 +229,7 @@ TEST_F(FreeCacheTest, FreeCacheOpenFile) { android::base::unique_fd fd(open(file1_path.c_str(), O_RDONLY)); // file1 can't be deleted as it's opened by us. - ASSERT_FALSE(RemoveFilesInDirectory(4096 * 10, mock_cache.path, [this](const std::string& dir) { - return this->MockFreeSpaceChecker(dir); - })); + ASSERT_FALSE(RemoveFilesInDirectory(4096 * 10, mock_cache.path, MockFreeSpaceChecker)); ASSERT_EQ(std::vector{ "file1" }, FindFilesInDir(mock_cache.path)); } @@ -234,9 +240,7 @@ TEST_F(FreeCacheTest, FreeCacheLogsSmoke) { AddFilesToDir(mock_log_dir.path, log_files); ASSERT_EQ(4096 * 5, MockFreeSpaceChecker(mock_log_dir.path)); - ASSERT_TRUE(RemoveFilesInDirectory(4096 * 8, mock_log_dir.path, [this](const std::string& dir) { - return this->MockFreeSpaceChecker(dir); - })); + ASSERT_TRUE(RemoveFilesInDirectory(4096 * 8, mock_log_dir.path, MockFreeSpaceChecker)); // Logs with a higher index will be deleted first std::vector expected = { "last_log", "last_log.1" }; @@ -250,9 +254,7 @@ TEST_F(FreeCacheTest, FreeCacheLogsStringComparison) { AddFilesToDir(mock_log_dir.path, log_files); ASSERT_EQ(4096 * 6, MockFreeSpaceChecker(mock_log_dir.path)); - ASSERT_TRUE(RemoveFilesInDirectory(4096 * 9, mock_log_dir.path, [this](const std::string& dir) { - return this->MockFreeSpaceChecker(dir); - })); + ASSERT_TRUE(RemoveFilesInDirectory(4096 * 9, mock_log_dir.path, MockFreeSpaceChecker)); // Logs with incorrect format will be deleted first; and the last_kmsg with the same index is // deleted before last_log. @@ -267,9 +269,7 @@ TEST_F(FreeCacheTest, FreeCacheLogsOtherFiles) { AddFilesToDir(mock_log_dir.path, log_files); ASSERT_EQ(4096 * 5, MockFreeSpaceChecker(mock_log_dir.path)); - ASSERT_FALSE(RemoveFilesInDirectory(4096 * 8, mock_log_dir.path, [this](const std::string& dir) { - return this->MockFreeSpaceChecker(dir); - })); + ASSERT_FALSE(RemoveFilesInDirectory(4096 * 8, mock_log_dir.path, MockFreeSpaceChecker)); // Non log files in /cache/recovery won't be deleted. std::vector expected = { "block.map", "command", "last_install" }; diff --git a/tests/unit/screen_ui_test.cpp b/tests/unit/screen_ui_test.cpp index 2f4b7b09b..4c0a868f0 100644 --- a/tests/unit/screen_ui_test.cpp +++ b/tests/unit/screen_ui_test.cpp @@ -446,8 +446,9 @@ TEST_F(ScreenRecoveryUITest, LoadAnimation_MissingAnimation) { RETURN_IF_NO_GRAPHICS; ASSERT_TRUE(ui_->Init(kTestLocale)); - TemporaryDir resource_dir; - Paths::Get().set_resource_dir(resource_dir.path); + // We need a dir that doesn't contain any animation. However, using TemporaryDir will give + // leftovers since this is a death test where TemporaryDir::~TemporaryDir() won't be called. + Paths::Get().set_resource_dir("/proc/self"); ::testing::FLAGS_gtest_death_test_style = "threadsafe"; ASSERT_EXIT(ui_->RunLoadAnimation(), ::testing::KilledBySignal(SIGABRT), ""); -- cgit v1.2.3