diff options
| author | Amin Hassani <ahassani@chromium.org> | 2020-10-26 17:21:29 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-10-29 00:46:59 +0000 |
| commit | ed03b44c7f9136d6491d7c238f1ab7b66c12456c (patch) | |
| tree | f6a0adb7ea4d324cd6b1b4c1a06010a8004cc25c /payload_consumer/filesystem_verifier_action_unittest.cc | |
| parent | 5d56c1eef7fd730a164c44a742ef2cb0afcfca8d (diff) | |
update_engine: Fix leaking unit tests
Some of the unit tests have been leaking temp files because they don't
properly unlink them. In this CL, we did some rearrangement of the
ScopedTempFile class and moved it into the utils.h (instead of testing
only location) so it can be used everywhere and more efficiently. Also
added functionality to open an file descriptor too so users don't have
to keep a different object for the file descriptor.
BUG=b:162766400
TEST=cros_workon_make --board reef --test; Then looked at the
/build/reef/tmp directory and no files were leaked.
Change-Id: Id64a2923d30f27628120497fdefe16bf65fa3fb0
Reviewed-on: https://chromium-review.googlesource.com/c/aosp/platform/system/update_engine/+/2500772
Tested-by: Amin Hassani <ahassani@chromium.org>
Reviewed-by: Jae Hoon Kim <kimjae@chromium.org>
Commit-Queue: Amin Hassani <ahassani@chromium.org>
Diffstat (limited to 'payload_consumer/filesystem_verifier_action_unittest.cc')
| -rw-r--r-- | payload_consumer/filesystem_verifier_action_unittest.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/payload_consumer/filesystem_verifier_action_unittest.cc b/payload_consumer/filesystem_verifier_action_unittest.cc index 2971849c..2c29b44f 100644 --- a/payload_consumer/filesystem_verifier_action_unittest.cc +++ b/payload_consumer/filesystem_verifier_action_unittest.cc @@ -92,7 +92,7 @@ class FilesystemVerifierActionTestDelegate : public ActionProcessorDelegate { bool FilesystemVerifierActionTest::DoTest(bool terminate_early, bool hash_fail) { - test_utils::ScopedTempFile a_loop_file("a_loop_file.XXXXXX"); + ScopedTempFile a_loop_file("a_loop_file.XXXXXX"); // Make random data for a. const size_t kLoopFileSize = 10 * 1024 * 1024 + 512; @@ -278,7 +278,7 @@ TEST_F(FilesystemVerifierActionTest, RunAsRootTerminateEarlyTest) { #ifdef __ANDROID__ TEST_F(FilesystemVerifierActionTest, RunAsRootWriteVerityTest) { - test_utils::ScopedTempFile part_file("part_file.XXXXXX"); + ScopedTempFile part_file("part_file.XXXXXX"); constexpr size_t filesystem_size = 200 * 4096; constexpr size_t part_size = 256 * 4096; brillo::Blob part_data(filesystem_size, 0x1); @@ -340,7 +340,7 @@ TEST_F(FilesystemVerifierActionTest, RunAsRootWriteVerityTest) { #endif // __ANDROID__ TEST_F(FilesystemVerifierActionTest, RunAsRootSkipWriteVerityTest) { - test_utils::ScopedTempFile part_file("part_file.XXXXXX"); + ScopedTempFile part_file("part_file.XXXXXX"); constexpr size_t filesystem_size = 200 * 4096; constexpr size_t part_size = 256 * 4096; brillo::Blob part_data(part_size); |