未验证 提交 307f9467 编写于 作者: O openharmony_ci 提交者: Gitee

!1597 fix init ut

Merge pull request !1597 from Mupceet/master_cc_fix_ut
......@@ -487,16 +487,13 @@ void PrepareInitUnitTestEnv(void)
InitAddPreCfgLoadHook(0, TestHook);
InitAddPostCfgLoadHook(0, TestHook);
InitAddPostPersistParamLoadHook(0, TestHook);
// ini system
SystemInit();
SystemPrepare();
SystemConfig();
#else
LoadSpecialParam();
#endif
// read default parameter from system
LoadDefaultParams("/system/etc/param/ohos_const", LOAD_PARAM_NORMAL);
LoadDefaultParams("/vendor/etc/param", LOAD_PARAM_NORMAL);
LoadDefaultParams("/system/etc/param", LOAD_PARAM_ONLY_ADD);
#endif
// read ut parameters
LoadDefaultParams(STARTUP_INIT_UT_PATH "/system/etc/param/ohos_const", LOAD_PARAM_NORMAL);
LoadDefaultParams(STARTUP_INIT_UT_PATH "/vendor/etc/param", LOAD_PARAM_NORMAL);
......
......@@ -440,7 +440,7 @@ HWTEST_F(ParamUnitTest, TestWorkSpace3, TestSize.Level0)
{
const char *spaceName = "test.workspace3";
int ret = AddWorkSpace(spaceName, 1, PARAM_WORKSPACE_DEF);
#ifndef OHOS_LITE
#ifdef PARAM_SUPPORT_SELINUX
EXPECT_NE(ret, 0);
#else
EXPECT_EQ(ret, 0);
......
......@@ -550,9 +550,11 @@ HWTEST_F(ParamServiceUnitTest, TestServiceCtrl, TestSize.Level0)
ParamServiceUnitTest test;
int ret = test.TestServiceCtrl("server1", 0770);
EXPECT_NE(ret, 0);
#ifdef PARAM_SUPPORT_SELINUX
// selinux forbid
ret = test.TestServiceCtrl("server2", 0772);
EXPECT_NE(ret, 0);
#endif
ret = 0;
}
......@@ -562,24 +564,32 @@ HWTEST_F(ParamServiceUnitTest, TestPowerCtrl, TestSize.Level0)
int ret = test.TestPowerCtrl("reboot,shutdown", 0770);
EXPECT_NE(ret, 0);
ret = test.TestPowerCtrl("reboot,shutdown", 0772);
#ifdef PARAM_SUPPORT_SELINUX
// selinux forbid
EXPECT_NE(ret, 0);
#endif
ret = test.TestPowerCtrl("reboot,updater", 0770);
EXPECT_NE(ret, 0);
ret = test.TestPowerCtrl("reboot,updater", 0772);
#ifdef PARAM_SUPPORT_SELINUX
// selinux forbid
EXPECT_NE(ret, 0);
#endif
ret = test.TestPowerCtrl("reboot,flashd", 0770);
EXPECT_NE(ret, 0);
ret = test.TestPowerCtrl("reboot,flashd", 0772);
#ifdef PARAM_SUPPORT_SELINUX
// selinux forbid
EXPECT_NE(ret, 0);
#endif
ret = test.TestPowerCtrl("reboot", 0770);
EXPECT_NE(ret, 0);
ret = test.TestPowerCtrl("reboot", 0772);
#ifdef PARAM_SUPPORT_SELINUX
// selinux forbid
EXPECT_NE(ret, 0);
#endif
ParamServiceStop();
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册