diff options
Diffstat (limited to 'init/ueventd_parser_test.cpp')
| -rw-r--r-- | init/ueventd_parser_test.cpp | 69 |
1 files changed, 10 insertions, 59 deletions
diff --git a/init/ueventd_parser_test.cpp b/init/ueventd_parser_test.cpp index 41924e235..c5aa9e3b5 100644 --- a/init/ueventd_parser_test.cpp +++ b/init/ueventd_parser_test.cpp @@ -49,7 +49,6 @@ 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.gid, test.gid) << expected.gid; EXPECT_EQ(expected.handler_path, test.handler_path) << expected.handler_path; } @@ -77,7 +76,6 @@ void TestUeventdFile(const std::string& content, const UeventdConfiguration& exp EXPECT_EQ(expected.firmware_directories, result.firmware_directories); TestVector(expected.external_firmware_handlers, result.external_firmware_handlers, TestExternalFirmwareHandler); - EXPECT_EQ(expected.parallel_restorecon_dirs, result.parallel_restorecon_dirs); } TEST(ueventd_parser, EmptyFile) { @@ -106,7 +104,7 @@ subsystem test_devpath_dirname {"test_devname2", Subsystem::DEVNAME_UEVENT_DEVNAME, "/dev"}, {"test_devpath_dirname", Subsystem::DEVNAME_UEVENT_DEVPATH, "/dev/graphics"}}; - TestUeventdFile(ueventd_file, {subsystems, {}, {}, {}, {}, {}}); + TestUeventdFile(ueventd_file, {subsystems, {}, {}, {}, {}}); } TEST(ueventd_parser, Permissions) { @@ -132,7 +130,7 @@ TEST(ueventd_parser, Permissions) { {"/sys/devices/virtual/*/input", "poll_delay", 0660, AID_ROOT, AID_INPUT, true}, }; - TestUeventdFile(ueventd_file, {{}, sysfs_permissions, permissions, {}, {}, {}}); + TestUeventdFile(ueventd_file, {{}, sysfs_permissions, permissions, {}, {}}); } TEST(ueventd_parser, FirmwareDirectories) { @@ -148,7 +146,7 @@ firmware_directories /more "/more", }; - TestUeventdFile(ueventd_file, {{}, {}, {}, firmware_directories, {}, {}}); + TestUeventdFile(ueventd_file, {{}, {}, {}, firmware_directories, {}}); } TEST(ueventd_parser, ExternalFirmwareHandlers) { @@ -159,62 +157,42 @@ external_firmware_handler /devices/path/firmware/something002.bin radio "/vendor external_firmware_handler /devices/path/firmware/* root "/vendor/bin/firmware_handler.sh" external_firmware_handler /devices/path/firmware/something* system "/vendor/bin/firmware_handler.sh" external_firmware_handler /devices/path/*/firmware/something*.bin radio "/vendor/bin/firmware_handler.sh" -external_firmware_handler /devices/path/firmware/something003.bin system system /vendor/bin/firmware_handler.sh -external_firmware_handler /devices/path/firmware/something004.bin radio radio "/vendor/bin/firmware_handler.sh --has --arguments" )"; auto external_firmware_handlers = std::vector<ExternalFirmwareHandler>{ { "devpath", AID_ROOT, - AID_ROOT, "handler_path", }, { "/devices/path/firmware/something001.bin", AID_SYSTEM, - AID_ROOT, "/vendor/bin/firmware_handler.sh", }, { "/devices/path/firmware/something002.bin", AID_RADIO, - AID_ROOT, "/vendor/bin/firmware_handler.sh --has --arguments", }, { "/devices/path/firmware/", AID_ROOT, - AID_ROOT, "/vendor/bin/firmware_handler.sh", }, { "/devices/path/firmware/something", AID_SYSTEM, - AID_ROOT, "/vendor/bin/firmware_handler.sh", }, { "/devices/path/*/firmware/something*.bin", AID_RADIO, - AID_ROOT, - "/vendor/bin/firmware_handler.sh", - }, - { - "/devices/path/firmware/something003.bin", - AID_SYSTEM, - AID_SYSTEM, "/vendor/bin/firmware_handler.sh", }, - { - "/devices/path/firmware/something004.bin", - AID_RADIO, - AID_RADIO, - "/vendor/bin/firmware_handler.sh --has --arguments", - }, }; - TestUeventdFile(ueventd_file, {{}, {}, {}, {}, external_firmware_handlers, {}}); + TestUeventdFile(ueventd_file, {{}, {}, {}, {}, external_firmware_handlers}); } TEST(ueventd_parser, ExternalFirmwareHandlersDuplicate) { @@ -227,26 +205,11 @@ external_firmware_handler devpath root handler_path2 { "devpath", AID_ROOT, - AID_ROOT, "handler_path", }, }; - TestUeventdFile(ueventd_file, {{}, {}, {}, {}, external_firmware_handlers, {}}); -} - -TEST(ueventd_parser, ParallelRestoreconDirs) { - auto ueventd_file = R"( -parallel_restorecon_dir /sys -parallel_restorecon_dir /sys/devices -)"; - - auto parallel_restorecon_dirs = std::vector<std::string>{ - "/sys", - "/sys/devices", - }; - - TestUeventdFile(ueventd_file, {{}, {}, {}, {}, {}, parallel_restorecon_dirs}); + TestUeventdFile(ueventd_file, {{}, {}, {}, {}, external_firmware_handlers}); } TEST(ueventd_parser, UeventSocketRcvbufSize) { @@ -255,7 +218,7 @@ uevent_socket_rcvbuf_size 8k uevent_socket_rcvbuf_size 8M )"; - TestUeventdFile(ueventd_file, {{}, {}, {}, {}, {}, {}, false, 8 * 1024 * 1024}); + TestUeventdFile(ueventd_file, {{}, {}, {}, {}, {}, false, 8 * 1024 * 1024}); } TEST(ueventd_parser, EnabledDisabledLines) { @@ -265,7 +228,7 @@ parallel_restorecon enabled modalias_handling disabled )"; - TestUeventdFile(ueventd_file, {{}, {}, {}, {}, {}, {}, false, 0, true}); + TestUeventdFile(ueventd_file, {{}, {}, {}, {}, {}, false, 0, true}); auto ueventd_file2 = R"( parallel_restorecon enabled @@ -273,7 +236,7 @@ modalias_handling enabled parallel_restorecon disabled )"; - TestUeventdFile(ueventd_file2, {{}, {}, {}, {}, {}, {}, true, 0, false}); + TestUeventdFile(ueventd_file2, {{}, {}, {}, {}, {}, true, 0, false}); } TEST(ueventd_parser, AllTogether) { @@ -313,9 +276,6 @@ uevent_socket_rcvbuf_size 6M modalias_handling enabled parallel_restorecon enabled -parallel_restorecon_dir /sys -parallel_restorecon_dir /sys/devices - #ending comment )"; @@ -345,20 +305,14 @@ parallel_restorecon_dir /sys/devices }; auto external_firmware_handlers = std::vector<ExternalFirmwareHandler>{ - {"/devices/path/firmware/firmware001.bin", AID_ROOT, AID_ROOT, "/vendor/bin/touch.sh"}, - }; - - auto parallel_restorecon_dirs = std::vector<std::string>{ - "/sys", - "/sys/devices", + {"/devices/path/firmware/firmware001.bin", AID_ROOT, "/vendor/bin/touch.sh"}, }; size_t uevent_socket_rcvbuf_size = 6 * 1024 * 1024; TestUeventdFile(ueventd_file, {subsystems, sysfs_permissions, permissions, firmware_directories, - external_firmware_handlers, parallel_restorecon_dirs, true, - uevent_socket_rcvbuf_size, true}); + external_firmware_handlers, true, uevent_socket_rcvbuf_size, true}); } // All of these lines are ill-formed, so test that there is 0 output. @@ -390,9 +344,6 @@ external_firmware_handler external_firmware_handler blah blah external_firmware_handler blah blah blah blah -parallel_restorecon_dir -parallel_restorecon_dir /sys /sys/devices - )"; TestUeventdFile(ueventd_file, {}); |