!711 L2 时间修改/多余文件删除

Merge pull request !711 from jiyong/master

aafwk/aafwk_standard/featureability/actsfeatureabilitytest/entry/package.json

-{}

aafwk/aafwk_standard/featureability/sceneproject/finishwithresultemptytest/package.json

-{}

aafwk/aafwk_standard/featureability/sceneproject/finishwithresultpromiseparameterstest/package.json

-{}

aafwk/aafwk_standard/featureability/sceneproject/finishwithresulttest/package.json

-{}

aafwk/aafwk_standard/featureability/sceneproject/getcallingbundletest/package.json

-{}

aafwk/aafwk_standard/featureability/sceneproject/startability/package.json

-{}

aafwk/aafwk_standard/featureability/sceneproject/startabilityforresult/package.json

-{}

aafwk/aafwk_standard/featureability/sceneproject/terminateabilitytest/package.json

-{}

appexecfwk/ams_standard/amszipfileunzipfilest/Test.json

@@ -2,9 +2,9 @@
     "description": "Configuration for hjunit demo Tests",
     "driver": {
         "type": "JSUnitTest",
-        "test-timeout": "21600000",
+        "test-timeout": "120000",
         "package": "com.example.actsbundlemanagertest",
-        "shell-timeout": "21600000"
+        "shell-timeout": "60000"
     },
     "kits": [
         {

appexecfwk/ams_standard/fwkdataaccessor/entry/package.json

-{}

appexecfwk/bundle_standard/bundlemanager/actsbmsallshortcutinfotest/entry/package.json

-{}

appexecfwk/bundle_standard/bundlemanager/actsbmscheckpermissiontest/entry/package.json

-{}

appexecfwk/bundle_standard/bundlemanager/actsbmshapmoduletest/entry/package.json

-{}

appexecfwk/bundle_standard/bundlemanager/actsbmsjstest/entry/package.json

-{}

appexecfwk/bundle_standard/bundlemanager/actsbmsmetadatatest/entry/package.json

-{}

appexecfwk/bundle_standard/bundlemanager/actsbmsmoduleusagerecordtest/entry/package.json

-{}

appexecfwk/bundle_standard/bundlemanager/actsbundlemanagertest/entry/package.json

-{}

appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsgetinfosfifthscene/package.json

-{}

appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsgetinfosfirstscene/package.json

-{}

appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsgetinfosfirstsceneupdate/package.json

-{}

appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsgetinfosfourthscene/package.json

-{}

appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsgetinfosjsscene/package.json

-{}

appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsgetinfosscenesystem/package.json

-{}

appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsgetinfosscenevendor/package.json

-{}

appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsgetinfossecondscene/package.json

-{}

appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsgetinfosthirdscene/package.json

-{}

appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsmainabilityfirstscene/package.json

-{}

appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsmainabilitysecondscene/package.json

-{}

appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneeight/package.json

-{}

appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenefive/package.json

-{}

appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenefour/package.json

-{}

appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenenine/package.json

-{}

appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneone/package.json

-{}

appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneseven/package.json

-{}

appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenesix/package.json

-{}

appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenethree/package.json

-{}

appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenetwo/package.json

-{}

notification/ans_standard/actsansnotificationcancel/entry/package.json

-{}

notification/ans_standard/actsansnotificationremove/entry/package.json

-{}

notification/ans_standard/actsansslottest/actsansgetslottestcallback/entry/package.json

-{}

notification/ans_standard/actsansslottest/actsansgetslottestpromise/entry/package.json

-{}

notification/ans_standard/actsansslottest/actsansremoveslottest/entry/package.json

-{}

notification/ans_standard/actsansslottest/actsansslotsystemcallback/Test.json

@@ -2,9 +2,9 @@
     "description": "Configuration for hjunit demo Tests",
     "driver": {
         "type": "JSUnitTest",
-        "test-timeout": "21600000",
+        "test-timeout": "120000",
         "package": "com.example.actsansslotsystemcallback",
-        "shell-timeout": "21600000"
+        "shell-timeout": "60000"
     },
     "kits": [
         {

notification/ans_standard/actsansslottest/actsansslotsystemcallback/entry/package.json

-{}

notification/ans_standard/actsansslottest/actsansslotsystempromise/Test.json

@@ -2,9 +2,9 @@
     "description": "Configuration for hjunit demo Tests",
     "driver": {
         "type": "JSUnitTest",
-        "test-timeout": "21600000",
+        "test-timeout": "120000",
         "package": "com.example.actsansslotsystempromise",
-        "shell-timeout": "21600000"
+        "shell-timeout": "60000"
     },
     "kits": [
         {

notification/ans_standard/actsansslottest/actsansslotsystempromise/entry/package.json

-{}

notification/ans_standard/publish_test/actsanspublishcontroltest/entry/package.json

-{}

notification/ans_standard/publish_test/badgedisplayed/badgedisplayfive/entry/package.json

-{}

notification/ans_standard/publish_test/badgedisplayed/badgedisplayfour/entry/package.json

-{}

notification/ans_standard/publish_test/badgedisplayed/badgedisplayone/entry/package.json

-{}

notification/ans_standard/publish_test/badgedisplayed/badgedisplaysix/entry/package.json

-{}

notification/ans_standard/publish_test/badgedisplayed/badgedisplaytree/entry/package.json

-{}

notification/ans_standard/publish_test/badgedisplayed/badgedisplaytwo/entry/package.json

-{}

notification/ans_standard/publish_test/badgedisplayed/localcandisplay/entry/package.json

-{}

notification/ans_standard/publish_test/badgedisplayedset/badgedisplaysetfive/entry/package.json

-{}

notification/ans_standard/publish_test/badgedisplayedset/badgedisplaysetfour/entry/package.json

-{}

notification/ans_standard/publish_test/badgedisplayedset/badgedisplaysetone/entry/package.json

-{}

notification/ans_standard/publish_test/badgedisplayedset/badgedisplaysetsix/entry/package.json

-{}

notification/ans_standard/publish_test/badgedisplayedset/badgedisplaysettree/entry/package.json

-{}

notification/ans_standard/publish_test/badgedisplayedset/badgedisplaysettwo/entry/package.json

-{}

notification/ans_standard/publish_test/enablenotification/enablenotificationfive/entry/package.json

-{}

notification/ans_standard/publish_test/enablenotification/enablenotificationfour/entry/package.json

-{}

notification/ans_standard/publish_test/enablenotification/enablenotificationone/entry/package.json

-{}

notification/ans_standard/publish_test/enablenotification/enablenotificationsix/entry/package.json

-{}

notification/ans_standard/publish_test/enablenotification/enablenotificationtree/entry/package.json

-{}

notification/ans_standard/publish_test/enablenotification/enablenotificationtwo/entry/package.json

-{}

notification/ans_standard/publish_test/enablenotification/localnotificationenable/entry/.gitignore

-/build

notification/ans_standard/publish_test/enablenotification/localnotificationenable/entry/package.json

-{}

notification/ans_standard/publish_test/enablenotificationset/enablenotificationfive/entry/package.json

-{}

notification/ans_standard/publish_test/enablenotificationset/enablenotificationfour/entry/package.json

-{}

notification/ans_standard/publish_test/enablenotificationset/enablenotificationone/entry/package.json

-{}

notification/ans_standard/publish_test/enablenotificationset/enablenotificationsix/entry/package.json

-{}

notification/ans_standard/publish_test/enablenotificationset/enablenotificationtree/entry/package.json

-{}

notification/ans_standard/publish_test/enablenotificationset/enablenotificationtwo/entry/package.json

-{}

notification/ans_standard/publish_test/getactive/getactivenormal/active/Test.json

@@ -2,9 +2,9 @@
     "description": "Configuration for hjunit demo Tests",
     "driver": {
         "type": "JSUnitTest",
-        "test-timeout": "21600000",
+        "test-timeout": "120000",
         "package": "com.example.actsansgetactivetest",
-        "shell-timeout": "21600000"
+        "shell-timeout": "60000"
     },
     "kits": [
         {

notification/ans_standard/publish_test/getactive/getactivenormal/active/entry/package.json

-{}

notification/ans_standard/publish_test/getactive/getactivenormal/publish/Test.json

@@ -2,9 +2,9 @@
     "description": "Configuration for hjunit demo Tests",
     "driver": {
         "type": "JSUnitTest",
-        "test-timeout": "21600000",
+        "test-timeout": "120000",
         "package": "com.example.actsansactivepublishtest",
-        "shell-timeout": "21600000"
+        "shell-timeout": "60000"
     },
     "kits": [
         {

notification/ans_standard/publish_test/getactive/getactivenormal/publish/entry/package.json

-{}

notification/ans_standard/publish_test/getactive/getactivenormal/sub/Test.json

@@ -2,9 +2,9 @@
     "description": "Configuration for hjunit demo Tests",
     "driver": {
         "type": "JSUnitTest",
-        "test-timeout": "21600000",
+        "test-timeout": "120000",
         "package": "com.example.actsansactivesubscribertest",
-        "shell-timeout": "21600000"
+        "shell-timeout": "60000"
     },
     "kits": [
         {

notification/ans_standard/publish_test/getactive/getactivenormal/sub/entry/package.json

-{}

notification/ans_standard/publish_test/getactive/getcancelactivenum/Test.json

@@ -2,9 +2,9 @@
     "description": "Configuration for hjunit demo Tests",
     "driver": {
         "type": "JSUnitTest",
-        "test-timeout": "21600000",
+        "test-timeout": "120000",
         "package": "com.example.actsansgetcancelactivenumtest",
-        "shell-timeout": "21600000"
+        "shell-timeout": "60000"
     },
     "kits": [
         {

notification/ans_standard/publish_test/getactive/getcancelactivenum/entry/package.json

-{}

notification/ans_standard/publish_test/getwantagentinfo/getwantagentinfoone/entry/package.json

-{}

notification/ans_standard/publish_test/getwantagentinfo/getwantagentinfoonepro/entry/package.json

-{}

notification/ans_standard/publish_test/getwantagentinfo/getwantagentinfotwo/entry/package.json

-{}

notification/ans_standard/publish_test/getwantagentinfo/getwantagentinfotwopro/entry/package.json

-{}

notification/ans_standard/publish_test/publishcontentype/entry/package.json

-{}

notification/ans_standard/publish_test/subscribe/publishfirst/entry/.gitignore

-/build

notification/ans_standard/publish_test/subscribe/publishfirst/entry/package.json

-{}

notification/ans_standard/publish_test/subscribe/publishsecond/entry/.gitignore

-/build

notification/ans_standard/publish_test/subscribe/publishsecond/entry/package.json

-{}

notification/ans_standard/publish_test/subscribe/subscribe/entry/package.json

-{}

notification/ans_standard/publish_test/unsubscribe/entry/package.json

-{}

notification/ans_standard/publish_test/wantagent/sub/entry/package.json

-{}

notification/ans_standard/publish_test/wantagent/test1/Test.json

 {
     "description": "Configuration for hjunit demo Tests",
-    "driver": {
-        "type": "JSUnitTest",
-        "test-timeout": "60000",
-        "package": "com.example.WantAgentTest1",
-        "shell-timeout": "60000"
-    },
-    "kits": [
-        {
-            "test-file-name": [
-                "test1.hap"
-            ],
-            "type": "AppInstallKit",
-            "cleanup-apps": true
-        }
-    ]
 }

notification/ans_standard/publish_test/wantagent/test1/entry/package.json

-{}

notification/ans_standard/publish_test/wantagent/test2/Test.json

 {
     "description": "Configuration for hjunit demo Tests",
-    "driver": {
-        "type": "JSUnitTest",
-        "test-timeout": "60000",
-        "package": "com.example.WantAgenTest2",
-        "shell-timeout": "60000"
-    },
-    "kits": [
-        {
-            "test-file-name": [
-                "test2.hap"
-            ],
-            "type": "AppInstallKit",
-            "cleanup-apps": true
-        }
-    ]
 }

notification/ans_standard/publish_test/wantagent/test2/entry/package.json

-{}

notification/ans_standard/publish_test/wantagent/wantagent1/Test.json

@@ -9,8 +9,8 @@
     "kits": [
         {
             "test-file-name": [
-                "ActsAnsWantAgentOneTest.hap"
-		"test1.hap"
+                "ActsAnsWantAgentOneTest.hap",
+                "test1.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

notification/ans_standard/publish_test/wantagent/wantagent1/entry/package.json

-{}

notification/ans_standard/publish_test/wantagent/wantagent1promise/Test.json

@@ -9,8 +9,8 @@
     "kits": [
         {
             "test-file-name": [
-                "ActsAnsWantAgentOneProTest.hap"
-		"test1"
+                "ActsAnsWantAgentOneProTest.hap",
+                "test1.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

notification/ans_standard/publish_test/wantagent/wantagent1promise/entry/package.json

-{}

notification/ans_standard/publish_test/wantagent/wantagent2/Test.json

@@ -10,8 +10,8 @@
         {
             "test-file-name": [
                 "ActsAnsWantAgentTwoTest.hap",
-		"test1.hap",
-		"test2.hap"
+                "test1.hap",
+                "test2.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

notification/ans_standard/publish_test/wantagent/wantagent2/entry/package.json

-{}

notification/ans_standard/publish_test/wantagent/wantagent2promise/Test.json

@@ -10,8 +10,8 @@
         {
             "test-file-name": [
                 "ActsAnsWantAgentTwoProTest.hap",
-		"test1.hap",
-		"test2.hap"
+                "test1.hap",
+                "test2.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

notification/ans_standard/publish_test/wantagent/wantagent2promise/entry/package.json

-{}

notification/ans_standard/publish_test/wantagent/wantagent3/entry/package.json

-{}

notification/ans_standard/publish_test/wantagent/wantagent3promise/entry/package.json

-{}

notification/ans_standard/publish_test/wantagent/wantagent4/entry/package.json

-{}

notification/ans_standard/publish_test/wantagent/wantagent4promise/entry/package.json

-{}

notification/ans_standard/publish_test/wantagent/wantagent5/entry/package.json

-{}

notification/ans_standard/publish_test/wantagent/wantagent5promise/entry/package.json

-{}

notification/ans_standard/publishicontest/entry/package.json

-{}