diff options
| author | Tom Cherry <tomcherry@google.com> | 2017-05-04 18:17:33 -0700 |
|---|---|---|
| committer | Tom Cherry <tomcherry@google.com> | 2017-05-05 14:37:12 -0700 |
| commit | 2cbbe9f7a35efdc94e8e34ef92eb6f70a85887fe (patch) | |
| tree | 215ecac00aa47fbac652e5e7bc99761176884b84 /init/init_test.cpp | |
| parent | 517e1f17cfec2143d4d10a64b1496a550acf3ea2 (diff) | |
init: do not log directly from read_file() and write_file()
Their callers may be able to add more context, so use an error string
to record the error.
Bug: 38038887
Test: boot bullhead
Test: Init unit tests
Change-Id: I46690d1c66e00a4b15cadc6fd0d6b50e990388c3
Diffstat (limited to 'init/init_test.cpp')
| -rw-r--r-- | init/init_test.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/init/init_test.cpp b/init/init_test.cpp index 3da14b5ab..7093ba980 100644 --- a/init/init_test.cpp +++ b/init/init_test.cpp @@ -152,10 +152,11 @@ TEST(init, EventTriggerOrderMultipleFiles) { "on boot\n" "execute 3"; // clang-format on - // write_file() ensures the right mode is set - ASSERT_TRUE(write_file(std::string(dir.path) + "/a.rc", dir_a_script)); + // WriteFile() ensures the right mode is set + std::string err; + ASSERT_TRUE(WriteFile(std::string(dir.path) + "/a.rc", dir_a_script, &err)); - ASSERT_TRUE(write_file(std::string(dir.path) + "/b.rc", "on boot\nexecute 5")); + ASSERT_TRUE(WriteFile(std::string(dir.path) + "/b.rc", "on boot\nexecute 5", &err)); // clang-format off std::string start_script = "import " + std::string(first_import.path) + "\n" |