!792 提交敏感词修改

Merge pull request !792 from 刘晓培/cherry-pick-1632741703

distributed_schedule_lite/distributed_schedule_posix/src/MsgParserFuncTest.cpp

@@ -67,12 +67,11 @@ protected:
 */
 HWTEST_F(MsgParserFuncTest, testMsgParserFunc0010, Function | MediumTest | Level1) {
     uint8_t buffer[] = {
-        0x01, 0x01, 0x01, 0x02, 0x14, 0x63, 0x6f, 0x6d, 0x2e, 0x68,
-        0x75, 0x61, 0x77, 0x65, 0x69, 0x2e, 0x6c, 0x61, 0x75, 0x6e,
-        0x63, 0x68, 0x65, 0x72, 0x00, 0x03, 0x0d, 0x4d, 0x61, 0x69,
-        0x6e, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x00,
-        0x04, 0x0a, 0x70, 0x75, 0x62, 0x6C, 0x69, 0x63, 0x6B, 0x65,
-        0x79, 0x00
+        0x01, 0x01, 0x01, 0x02, 0x14, 0x63, 0x6f, 0x6d, 0x2e, 0x6f,
+        0x68, 0x6f, 0x73, 0x2e, 0x6c, 0x61, 0x75, 0x6e, 0x63, 0x68,
+        0x65, 0x72, 0x00, 0x03, 0x0d, 0x4d, 0x61, 0x69, 0x6e, 0x41,
+        0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x00, 0x04, 0x0a,
+        0x70, 0x75, 0x62, 0x6C, 0x69, 0x63, 0x6B, 0x65, 0x79, 0x00
     };
 
     handleFlag = FALSE;
@@ -81,7 +80,7 @@ HWTEST_F(MsgParserFuncTest, testMsgParserFunc0010, Function | MediumTest | Level
         const TlvDmsMsgInfo *msg = reinterpret_cast<const TlvDmsMsgInfo *>(dmsMsg);
         EXPECT_EQ(errCode, DMS_TLV_SUCCESS);
         EXPECT_EQ(msg->commandId, 1);
-        EXPECT_EQ(string(msg->calleeBundleName), "com.huawei.launcher");
+        EXPECT_EQ(string(msg->calleeBundleName), "com.ohos.launcher");
         EXPECT_EQ(string(msg->calleeAbilityName), "MainActivity");
         EXPECT_EQ(string(msg->callerSignature), "publickey");
     };
@@ -730,10 +729,10 @@ HWTEST_F(MsgParserFuncTest, testMsgParserFunc0300, Function | MediumTest | Level
         0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d,
         0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78,
         0x79, 0x7a, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49,
-        0x4a, 0x2e, 0x68, 0x75, 0x61, 0x77, 0x65, 0x69, 0x00, 0x03, 0x0d,
-        0x4d, 0x61, 0x69, 0x6e, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74,
-        0x79, 0x00, 0x04, 0x0a, 0x70, 0x75, 0x62, 0x6C, 0x69, 0x63, 0x6B,
-        0x65, 0x79, 0x00
+        0x4a, 0x2e, 0x6f, 0x68, 0x6f, 0x73, 0x00, 0x03, 0x0d, 0x4d, 0x61,
+        0x69, 0x6e, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x00,
+        0x04, 0x0a, 0x70, 0x75, 0x62, 0x6C, 0x69, 0x63, 0x6B, 0x65, 0x79,
+        0x00
     };
 
     handleFlag = FALSE;
@@ -747,7 +746,7 @@ HWTEST_F(MsgParserFuncTest, testMsgParserFunc0300, Function | MediumTest | Level
             ss << "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
         }
         ss << "abcdefghijklmnopqrstuvwxyzABCDEFGHIJ";
-        ss << ".huawei";
+        ss << ".ohos";
         EXPECT_EQ(msg->commandId, 1);
         EXPECT_EQ(string(msg->calleeBundleName), ss.str());
         EXPECT_EQ(string(msg->calleeAbilityName), "MainActivity");

distributed_schedule_lite/distributed_schedule_posix/src/utils/DMSTestBase.cpp

@@ -87,6 +87,6 @@ BOOL InstallHap()
 BOOL UninstallHap()
 {
     sem_init(&g_sem, 0, 0);
-    Uninstall("com.huawei.helloworld", nullptr, TestBundleStateCallback);
+    Uninstall("com.ohos.helloworld", nullptr, TestBundleStateCallback);
     sem_wait(&g_sem);
 }

distributedhardware/devicemanagerjstest/Test.json

@@ -2,9 +2,9 @@
     "description": "Configuration for devicemanager Tests",
     "driver": {
         "type": "JSUnitTest",
-        "test-timeout": "21600000",
+        "test-timeout": "60000",
         "package": "com.ohos.deviceManagertest",
-        "shell-timeout": "21600000"
+        "shell-timeout": "60000"
     },
     "kits": [
         {