diff options
Diffstat (limited to 'init/init_parser_test.cpp')
| -rw-r--r-- | init/init_parser_test.cpp | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/init/init_parser_test.cpp b/init/init_parser_test.cpp index d8fd2bab9..86d60d024 100644 --- a/init/init_parser_test.cpp +++ b/init/init_parser_test.cpp @@ -86,19 +86,29 @@ static void Test_make_exec_oneshot_service(bool dash_dash, bool seclabel, bool u ASSERT_EQ("", svc->seclabel()); } if (uid) { - ASSERT_EQ(decode_uid("log"), svc->uid()); + uid_t decoded_uid; + std::string err; + ASSERT_TRUE(DecodeUid("log", &decoded_uid, &err)); + ASSERT_EQ(decoded_uid, svc->uid()); } else { ASSERT_EQ(0U, svc->uid()); } if (gid) { - ASSERT_EQ(decode_uid("shell"), svc->gid()); + uid_t decoded_uid; + std::string err; + ASSERT_TRUE(DecodeUid("shell", &decoded_uid, &err)); + ASSERT_EQ(decoded_uid, svc->gid()); } else { ASSERT_EQ(0U, svc->gid()); } if (supplementary_gids) { ASSERT_EQ(2U, svc->supp_gids().size()); - ASSERT_EQ(decode_uid("system"), svc->supp_gids()[0]); - ASSERT_EQ(decode_uid("adb"), svc->supp_gids()[1]); + uid_t decoded_uid; + std::string err; + ASSERT_TRUE(DecodeUid("system", &decoded_uid, &err)); + ASSERT_EQ(decoded_uid, svc->supp_gids()[0]); + ASSERT_TRUE(DecodeUid("adb", &decoded_uid, &err)); + ASSERT_EQ(decoded_uid, svc->supp_gids()[1]); } else { ASSERT_EQ(0U, svc->supp_gids().size()); } |