AU: shift to use new TMPDIR-enabled temp file
The main change here is that delta generator will now create all
temporary files in TMPDIR, if set. Other than that, we're converting all
other temporary file/directory creation to use the new functions.
- All temps of the form "/tmp/foo" are converted to "foo": this
preserves the behavior in the default case (where TMPDIR is not set),
yet will do the right thing if run with a different TMPDIR.
- A few other cases (for example, temp file created relative to the
current working directory) will now be created in TMPDIR or /tmp.
These are all in unit tests and the transition makes sense anyway.
Note that two temp file/directory creation calls in actual UE code were
using "/tmp/..." and were not changed. This will ensure that they are
resilient to TMPDIR changes and will always be allocated in the same
(hard-coded) location.
BUG=chromium:253622
TEST=Unit tests.
Change-Id: Ia1208963a0e2fcd43b8d6f92bb3d1b7459e930a2
Reviewed-on: https://chromium-review.googlesource.com/182247
Tested-by: Gilad Arnold <garnold@chromium.org>
Reviewed-by: Don Garrett <dgarrett@chromium.org>
Commit-Queue: Gilad Arnold <garnold@chromium.org>
diff --git a/update_attempter_unittest.cc b/update_attempter_unittest.cc
index 0ec41c3..ac01ee3 100644
--- a/update_attempter_unittest.cc
+++ b/update_attempter_unittest.cc
@@ -202,7 +202,7 @@
TEST_F(UpdateAttempterTest, RunAsRootConstructWithUpdatedMarkerTest) {
string test_update_completed_marker;
CHECK(utils::MakeTempFile(
- "/tmp/update_attempter_unittest-update_completed_marker-XXXXXX",
+ "update_attempter_unittest-update_completed_marker-XXXXXX",
&test_update_completed_marker, NULL));
ScopedPathUnlinker completed_marker_unlinker(test_update_completed_marker);
const FilePath marker(test_update_completed_marker);
@@ -945,7 +945,7 @@
IsOOBEComplete()).WillRepeatedly(Return(true));
string prefs_dir;
- EXPECT_TRUE(utils::MakeTempDirectory("/tmp/ue_ut_prefs.XXXXXX",
+ EXPECT_TRUE(utils::MakeTempDirectory("ue_ut_prefs.XXXXXX",
&prefs_dir));
ScopedDirRemover temp_dir_remover(prefs_dir);
@@ -1010,7 +1010,7 @@
IsOOBEComplete()).WillRepeatedly(Return(true));
string prefs_dir;
- EXPECT_TRUE(utils::MakeTempDirectory("/tmp/ue_ut_prefs.XXXXXX",
+ EXPECT_TRUE(utils::MakeTempDirectory("ue_ut_prefs.XXXXXX",
&prefs_dir));
ScopedDirRemover temp_dir_remover(prefs_dir);
@@ -1059,7 +1059,7 @@
string temp_dir;
// We need persistent preferences for this test
- EXPECT_TRUE(utils::MakeTempDirectory("/tmp/UpdateCheckScheduler.XXXXXX",
+ EXPECT_TRUE(utils::MakeTempDirectory("UpdateCheckScheduler.XXXXXX",
&temp_dir));
prefs.Init(FilePath(temp_dir));
mock_system_state_.set_clock(&fake_clock);