diff options
| author | Suchang Woo <suchang.woo@samsung.com> | 2021-04-06 10:55:34 +0900 |
|---|---|---|
| committer | Suchang Woo <suchang.woo@samsung.com> | 2021-04-06 11:15:28 +0900 |
| commit | 8681f7e7a3953ce2627c429b2f5e8c347f28ba18 (patch) | |
| tree | 691b8cb3e6b8b4893dab51c9757df8b00e640a7a /init/ueventd_parser_test.cpp | |
| parent | 767f264fa4a8f019f6acfce8290e10f18113a524 (diff) | |
ueventd: Fix wrong argument index in devpath comparison
args[2](user name to run as) is used instead of args[1](devpath).
Test: atest CtsInitTestCases
Signed-off-by: Suchang Woo <suchang.woo@samsung.com>
Change-Id: Id271755993d55e332bad54d0414e2232071e5e8e
Diffstat (limited to 'init/ueventd_parser_test.cpp')
| -rw-r--r-- | init/ueventd_parser_test.cpp | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/init/ueventd_parser_test.cpp b/init/ueventd_parser_test.cpp index b604c53fc..4e63ba577 100644 --- a/init/ueventd_parser_test.cpp +++ b/init/ueventd_parser_test.cpp @@ -45,6 +45,13 @@ void TestSysfsPermissions(const SysfsPermissions& expected, const SysfsPermissio EXPECT_EQ(expected.attribute_, test.attribute_); } +void TestExternalFirmwareHandler(const ExternalFirmwareHandler& expected, + const ExternalFirmwareHandler& test) { + EXPECT_EQ(expected.devpath, test.devpath) << expected.devpath; + EXPECT_EQ(expected.uid, test.uid) << expected.uid; + EXPECT_EQ(expected.handler_path, test.handler_path) << expected.handler_path; +} + template <typename T, typename F> void TestVector(const T& expected, const T& test, F function) { ASSERT_EQ(expected.size(), test.size()); @@ -67,6 +74,8 @@ void TestUeventdFile(const std::string& content, const UeventdConfiguration& exp TestVector(expected.sysfs_permissions, result.sysfs_permissions, TestSysfsPermissions); TestVector(expected.dev_permissions, result.dev_permissions, TestPermissions); EXPECT_EQ(expected.firmware_directories, result.firmware_directories); + TestVector(expected.external_firmware_handlers, result.external_firmware_handlers, + TestExternalFirmwareHandler); } TEST(ueventd_parser, EmptyFile) { @@ -144,7 +153,7 @@ TEST(ueventd_parser, ExternalFirmwareHandlers) { auto ueventd_file = R"( external_firmware_handler devpath root handler_path external_firmware_handler /devices/path/firmware/something001.bin system /vendor/bin/firmware_handler.sh -external_firmware_handler /devices/path/firmware/something001.bin radio "/vendor/bin/firmware_handler.sh --has --arguments" +external_firmware_handler /devices/path/firmware/something002.bin radio "/vendor/bin/firmware_handler.sh --has --arguments" )"; auto external_firmware_handlers = std::vector<ExternalFirmwareHandler>{ @@ -159,7 +168,7 @@ external_firmware_handler /devices/path/firmware/something001.bin radio "/vendor "/vendor/bin/firmware_handler.sh", }, { - "/devices/path/firmware/something001.bin", + "/devices/path/firmware/something002.bin", AID_RADIO, "/vendor/bin/firmware_handler.sh --has --arguments", }, |