From 345ba9100a1c99aabd022e8750946457e1d880a5 Mon Sep 17 00:00:00 2001 From: yangbo Date: Mon, 17 Apr 2023 08:50:14 +0000 Subject: [PATCH] fix resource prepare Signed-off-by: yangbo --- .../medialibrary/mediaLibrary_album/Test.json | 16 +++++++++++++--- .../medialibrary/mediaLibrary_base/Test.json | 16 +++++++++++++--- .../medialibrary/mediaLibrary_favorite/Test.json | 16 +++++++++++++--- .../medialibrary/mediaLibrary_file/Test.json | 16 +++++++++++++--- .../mediaLibrary_fileAsset/Test.json | 16 +++++++++++++--- .../medialibrary/mediaLibrary_fileKey/Test.json | 16 +++++++++++++--- .../mediaLibrary_fileResult/Test.json | 16 +++++++++++++--- .../mediaLibrary_getThumbnail/Test.json | 16 +++++++++++++--- .../mediaLibrary_mediafetchoptions/Test.json | 16 +++++++++++++--- .../medialibrary/mediaLibrary_trash/Test.json | 16 +++++++++++++--- 10 files changed, 130 insertions(+), 30 deletions(-) diff --git a/multimedia/medialibrary/mediaLibrary_album/Test.json b/multimedia/medialibrary/mediaLibrary_album/Test.json index 73570ded8..ce5cab268 100644 --- a/multimedia/medialibrary/mediaLibrary_album/Test.json +++ b/multimedia/medialibrary/mediaLibrary_album/Test.json @@ -13,9 +13,12 @@ "type": "ShellKit", "pre-push": [], "run-command": [ - "rm -rf /storage/media/100/local/files/*", - "rm -rf /data/app/el2/100/database/com.ohos.medialibrary.medialibrarydata/*", - "mkdir -pv /storage/media/100/local/files/{Pictures,Videos,Audios}", + "rm -rf /storage/media/100/local/files/Audios/*", + "rm -rf /storage/media/100/local/files/Camera/*", + "rm -rf /storage/media/100/local/files/Documents/*", + "rm -rf /storage/media/100/local/files/Download/*", + "rm -rf /storage/media/100/local/files/Pictures/*", + "rm -rf /storage/media/100/local/files/Videos/*", "mkdir -p /storage/media/100/local/temp", "param set persist.sys.suspend_manager_enabled 0", "reboot", @@ -56,6 +59,13 @@ "sleep 10" ], "teardown-command": [ + "rm -rf /storage/media/100/local/files/Audios/*", + "rm -rf /storage/media/100/local/files/Camera/*", + "rm -rf /storage/media/100/local/files/Documents/*", + "rm -rf /storage/media/100/local/files/Download/*", + "rm -rf /storage/media/100/local/files/Pictures/*", + "rm -rf /storage/media/100/local/files/Videos/*", + "rm -rf /storage/media/100/local/temp", "param set persist.sys.suspend_manager_enabled 1", "reboot", "hilog -b X -D 0xD002B70", diff --git a/multimedia/medialibrary/mediaLibrary_base/Test.json b/multimedia/medialibrary/mediaLibrary_base/Test.json index bc985fe7d..dba3a98e8 100644 --- a/multimedia/medialibrary/mediaLibrary_base/Test.json +++ b/multimedia/medialibrary/mediaLibrary_base/Test.json @@ -13,9 +13,12 @@ "type": "ShellKit", "pre-push": [], "run-command": [ - "rm -rf /storage/media/100/local/files/*", - "rm -rf /data/app/el2/100/database/com.ohos.medialibrary.medialibrarydata/*", - "mkdir -pv /storage/media/100/local/files/{Pictures,Videos,Audios,Documents}", + "rm -rf /storage/media/100/local/files/Audios/*", + "rm -rf /storage/media/100/local/files/Camera/*", + "rm -rf /storage/media/100/local/files/Documents/*", + "rm -rf /storage/media/100/local/files/Download/*", + "rm -rf /storage/media/100/local/files/Pictures/*", + "rm -rf /storage/media/100/local/files/Videos/*", "mkdir -p /storage/media/100/local/temp", "param set persist.sys.suspend_manager_enabled 0", "reboot", @@ -56,6 +59,13 @@ "sleep 10" ], "teardown-command": [ + "rm -rf /storage/media/100/local/files/Audios/*", + "rm -rf /storage/media/100/local/files/Camera/*", + "rm -rf /storage/media/100/local/files/Documents/*", + "rm -rf /storage/media/100/local/files/Download/*", + "rm -rf /storage/media/100/local/files/Pictures/*", + "rm -rf /storage/media/100/local/files/Videos/*", + "rm -rf /storage/media/100/local/temp", "param set persist.sys.suspend_manager_enabled 1", "reboot", "hilog -b X -D 0xD002B70", diff --git a/multimedia/medialibrary/mediaLibrary_favorite/Test.json b/multimedia/medialibrary/mediaLibrary_favorite/Test.json index 16b1f02eb..cdfbde66d 100644 --- a/multimedia/medialibrary/mediaLibrary_favorite/Test.json +++ b/multimedia/medialibrary/mediaLibrary_favorite/Test.json @@ -13,9 +13,12 @@ "type": "ShellKit", "pre-push": [], "run-command": [ - "rm -rf /storage/media/100/local/files/*", - "rm -rf /data/app/el2/100/database/com.ohos.medialibrary.medialibrarydata/*", - "mkdir -pv /storage/media/100/local/files/{Pictures,Videos,Audios,Documents}", + "rm -rf /storage/media/100/local/files/Audios/*", + "rm -rf /storage/media/100/local/files/Camera/*", + "rm -rf /storage/media/100/local/files/Documents/*", + "rm -rf /storage/media/100/local/files/Download/*", + "rm -rf /storage/media/100/local/files/Pictures/*", + "rm -rf /storage/media/100/local/files/Videos/*", "mkdir -p /storage/media/100/local/temp", "param set persist.sys.suspend_manager_enabled 0", "reboot", @@ -56,6 +59,13 @@ "sleep 10" ], "teardown-command": [ + "rm -rf /storage/media/100/local/files/Audios/*", + "rm -rf /storage/media/100/local/files/Camera/*", + "rm -rf /storage/media/100/local/files/Documents/*", + "rm -rf /storage/media/100/local/files/Download/*", + "rm -rf /storage/media/100/local/files/Pictures/*", + "rm -rf /storage/media/100/local/files/Videos/*", + "rm -rf /storage/media/100/local/temp", "param set persist.sys.suspend_manager_enabled 1", "reboot", "hilog -b X -D 0xD002B70", diff --git a/multimedia/medialibrary/mediaLibrary_file/Test.json b/multimedia/medialibrary/mediaLibrary_file/Test.json index feb7f6242..e5d926288 100644 --- a/multimedia/medialibrary/mediaLibrary_file/Test.json +++ b/multimedia/medialibrary/mediaLibrary_file/Test.json @@ -13,9 +13,12 @@ "type": "ShellKit", "pre-push": [], "run-command": [ - "rm -rf /storage/media/100/local/files/*", - "rm -rf /data/app/el2/100/database/com.ohos.medialibrary.medialibrarydata/*", - "mkdir -pv /storage/media/100/local/files/{Pictures,Videos,Audios,Documents}", + "rm -rf /storage/media/100/local/files/Audios/*", + "rm -rf /storage/media/100/local/files/Camera/*", + "rm -rf /storage/media/100/local/files/Documents/*", + "rm -rf /storage/media/100/local/files/Download/*", + "rm -rf /storage/media/100/local/files/Pictures/*", + "rm -rf /storage/media/100/local/files/Videos/*", "mkdir -p /storage/media/100/local/temp", "param set persist.sys.suspend_manager_enabled 0", "reboot", @@ -60,6 +63,13 @@ "sleep 10" ], "teardown-command": [ + "rm -rf /storage/media/100/local/files/Audios/*", + "rm -rf /storage/media/100/local/files/Camera/*", + "rm -rf /storage/media/100/local/files/Documents/*", + "rm -rf /storage/media/100/local/files/Download/*", + "rm -rf /storage/media/100/local/files/Pictures/*", + "rm -rf /storage/media/100/local/files/Videos/*", + "rm -rf /storage/media/100/local/temp", "param set persist.sys.suspend_manager_enabled 1", "reboot", "hilog -b X -D 0xD002B70", diff --git a/multimedia/medialibrary/mediaLibrary_fileAsset/Test.json b/multimedia/medialibrary/mediaLibrary_fileAsset/Test.json index cbca915aa..a015a0e25 100644 --- a/multimedia/medialibrary/mediaLibrary_fileAsset/Test.json +++ b/multimedia/medialibrary/mediaLibrary_fileAsset/Test.json @@ -13,9 +13,12 @@ "type": "ShellKit", "pre-push": [], "run-command": [ - "rm -rf /storage/media/100/local/files/*", - "rm -rf /data/app/el2/100/database/com.ohos.medialibrary.medialibrarydata/*", - "mkdir -pv /storage/media/100/local/files/{Pictures,Videos,Audios,Documents}", + "rm -rf /storage/media/100/local/files/Audios/*", + "rm -rf /storage/media/100/local/files/Camera/*", + "rm -rf /storage/media/100/local/files/Documents/*", + "rm -rf /storage/media/100/local/files/Download/*", + "rm -rf /storage/media/100/local/files/Pictures/*", + "rm -rf /storage/media/100/local/files/Videos/*", "mkdir -p /storage/media/100/local/temp", "param set persist.sys.suspend_manager_enabled 0", "reboot", @@ -60,6 +63,13 @@ "sleep 10" ], "teardown-command": [ + "rm -rf /storage/media/100/local/files/Audios/*", + "rm -rf /storage/media/100/local/files/Camera/*", + "rm -rf /storage/media/100/local/files/Documents/*", + "rm -rf /storage/media/100/local/files/Download/*", + "rm -rf /storage/media/100/local/files/Pictures/*", + "rm -rf /storage/media/100/local/files/Videos/*", + "rm -rf /storage/media/100/local/temp", "param set persist.sys.suspend_manager_enabled 1", "reboot", "hilog -b X -D 0xD002B70", diff --git a/multimedia/medialibrary/mediaLibrary_fileKey/Test.json b/multimedia/medialibrary/mediaLibrary_fileKey/Test.json index 496635b55..acc8e07e3 100644 --- a/multimedia/medialibrary/mediaLibrary_fileKey/Test.json +++ b/multimedia/medialibrary/mediaLibrary_fileKey/Test.json @@ -13,9 +13,12 @@ "type": "ShellKit", "pre-push": [], "run-command": [ - "rm -rf /storage/media/100/local/files/*", - "rm -rf /data/app/el2/100/database/com.ohos.medialibrary.medialibrarydata/*", - "mkdir -pv /storage/media/100/local/files/{Pictures,Videos,Audios,Documents}", + "rm -rf /storage/media/100/local/files/Audios/*", + "rm -rf /storage/media/100/local/files/Camera/*", + "rm -rf /storage/media/100/local/files/Documents/*", + "rm -rf /storage/media/100/local/files/Download/*", + "rm -rf /storage/media/100/local/files/Pictures/*", + "rm -rf /storage/media/100/local/files/Videos/*", "mkdir -p /storage/media/100/local/temp", "param set persist.sys.suspend_manager_enabled 0", "reboot", @@ -52,6 +55,13 @@ "sleep 10" ], "teardown-command": [ + "rm -rf /storage/media/100/local/files/Audios/*", + "rm -rf /storage/media/100/local/files/Camera/*", + "rm -rf /storage/media/100/local/files/Documents/*", + "rm -rf /storage/media/100/local/files/Download/*", + "rm -rf /storage/media/100/local/files/Pictures/*", + "rm -rf /storage/media/100/local/files/Videos/*", + "rm -rf /storage/media/100/local/temp", "param set persist.sys.suspend_manager_enabled 1", "reboot", "hilog -b X -D 0xD002B70", diff --git a/multimedia/medialibrary/mediaLibrary_fileResult/Test.json b/multimedia/medialibrary/mediaLibrary_fileResult/Test.json index fbafbc042..ee646532e 100644 --- a/multimedia/medialibrary/mediaLibrary_fileResult/Test.json +++ b/multimedia/medialibrary/mediaLibrary_fileResult/Test.json @@ -13,9 +13,12 @@ "type": "ShellKit", "pre-push": [], "run-command": [ - "rm -rf /storage/media/100/local/files/*", - "rm -rf /data/app/el2/100/database/com.ohos.medialibrary.medialibrarydata/*", - "mkdir -pv /storage/media/100/local/files/{Pictures,Videos,Audios,Documents}", + "rm -rf /storage/media/100/local/files/Audios/*", + "rm -rf /storage/media/100/local/files/Camera/*", + "rm -rf /storage/media/100/local/files/Documents/*", + "rm -rf /storage/media/100/local/files/Download/*", + "rm -rf /storage/media/100/local/files/Pictures/*", + "rm -rf /storage/media/100/local/files/Videos/*", "mkdir -p /storage/media/100/local/temp", "param set persist.sys.suspend_manager_enabled 0", "reboot", @@ -56,6 +59,13 @@ "sleep 10" ], "teardown-command": [ + "rm -rf /storage/media/100/local/files/Audios/*", + "rm -rf /storage/media/100/local/files/Camera/*", + "rm -rf /storage/media/100/local/files/Documents/*", + "rm -rf /storage/media/100/local/files/Download/*", + "rm -rf /storage/media/100/local/files/Pictures/*", + "rm -rf /storage/media/100/local/files/Videos/*", + "rm -rf /storage/media/100/local/temp", "param set persist.sys.suspend_manager_enabled 1", "reboot", "hilog -b X -D 0xD002B70", diff --git a/multimedia/medialibrary/mediaLibrary_getThumbnail/Test.json b/multimedia/medialibrary/mediaLibrary_getThumbnail/Test.json index 697318cb9..b956bc71d 100644 --- a/multimedia/medialibrary/mediaLibrary_getThumbnail/Test.json +++ b/multimedia/medialibrary/mediaLibrary_getThumbnail/Test.json @@ -13,9 +13,12 @@ "type": "ShellKit", "pre-push": [], "run-command": [ - "rm -rf /storage/media/100/local/files/*", - "rm -rf /data/app/el2/100/database/com.ohos.medialibrary.MediaLibraryDataA/*", - "mkdir -pv /storage/media/100/local/files/{Pictures,Videos,Audios}", + "rm -rf /storage/media/100/local/files/Audios/*", + "rm -rf /storage/media/100/local/files/Camera/*", + "rm -rf /storage/media/100/local/files/Documents/*", + "rm -rf /storage/media/100/local/files/Download/*", + "rm -rf /storage/media/100/local/files/Pictures/*", + "rm -rf /storage/media/100/local/files/Videos/*", "mkdir -p /storage/media/100/local/temp", "param set persist.sys.suspend_manager_enabled 0", "reboot", @@ -53,6 +56,13 @@ "sleep 10" ], "teardown-command": [ + "rm -rf /storage/media/100/local/files/Audios/*", + "rm -rf /storage/media/100/local/files/Camera/*", + "rm -rf /storage/media/100/local/files/Documents/*", + "rm -rf /storage/media/100/local/files/Download/*", + "rm -rf /storage/media/100/local/files/Pictures/*", + "rm -rf /storage/media/100/local/files/Videos/*", + "rm -rf /storage/media/100/local/temp", "param set persist.sys.suspend_manager_enabled 1", "reboot", "hilog -b X -D 0xD002B70", diff --git a/multimedia/medialibrary/mediaLibrary_mediafetchoptions/Test.json b/multimedia/medialibrary/mediaLibrary_mediafetchoptions/Test.json index d3b44b559..de4499c9c 100644 --- a/multimedia/medialibrary/mediaLibrary_mediafetchoptions/Test.json +++ b/multimedia/medialibrary/mediaLibrary_mediafetchoptions/Test.json @@ -13,9 +13,12 @@ "type": "ShellKit", "pre-push": [], "run-command": [ - "rm -rf /storage/media/100/local/files/*", - "rm -rf /data/app/el2/100/database/com.ohos.medialibrary.medialibrarydata/*", - "mkdir -pv /storage/media/100/local/files/{Pictures,Videos,Audios,Documents}", + "rm -rf /storage/media/100/local/files/Audios/*", + "rm -rf /storage/media/100/local/files/Camera/*", + "rm -rf /storage/media/100/local/files/Documents/*", + "rm -rf /storage/media/100/local/files/Download/*", + "rm -rf /storage/media/100/local/files/Pictures/*", + "rm -rf /storage/media/100/local/files/Videos/*", "mkdir -p /storage/media/100/local/temp", "param set persist.sys.suspend_manager_enabled 0", "reboot", @@ -56,6 +59,13 @@ "sleep 10" ], "teardown-command": [ + "rm -rf /storage/media/100/local/files/Audios/*", + "rm -rf /storage/media/100/local/files/Camera/*", + "rm -rf /storage/media/100/local/files/Documents/*", + "rm -rf /storage/media/100/local/files/Download/*", + "rm -rf /storage/media/100/local/files/Pictures/*", + "rm -rf /storage/media/100/local/files/Videos/*", + "rm -rf /storage/media/100/local/temp", "param set persist.sys.suspend_manager_enabled 1", "reboot", "hilog -b X -D 0xD002B70", diff --git a/multimedia/medialibrary/mediaLibrary_trash/Test.json b/multimedia/medialibrary/mediaLibrary_trash/Test.json index d6a979bd4..b334c3fc7 100644 --- a/multimedia/medialibrary/mediaLibrary_trash/Test.json +++ b/multimedia/medialibrary/mediaLibrary_trash/Test.json @@ -13,9 +13,12 @@ "type": "ShellKit", "pre-push": [], "run-command": [ - "rm -rf /storage/media/100/local/files/*", - "rm -rf /data/app/el2/100/database/com.ohos.medialibrary.MediaLibraryDataA/*", - "mkdir -pv /storage/media/100/local/files/{Pictures,Videos,Audios,Documents}", + "rm -rf /storage/media/100/local/files/Audios/*", + "rm -rf /storage/media/100/local/files/Camera/*", + "rm -rf /storage/media/100/local/files/Documents/*", + "rm -rf /storage/media/100/local/files/Download/*", + "rm -rf /storage/media/100/local/files/Pictures/*", + "rm -rf /storage/media/100/local/files/Videos/*", "mkdir -p /storage/media/100/local/temp", "param set persist.sys.suspend_manager_enabled 0", "reboot", @@ -56,6 +59,13 @@ "sleep 10" ], "teardown-command": [ + "rm -rf /storage/media/100/local/files/Audios/*", + "rm -rf /storage/media/100/local/files/Camera/*", + "rm -rf /storage/media/100/local/files/Documents/*", + "rm -rf /storage/media/100/local/files/Download/*", + "rm -rf /storage/media/100/local/files/Pictures/*", + "rm -rf /storage/media/100/local/files/Videos/*", + "rm -rf /storage/media/100/local/temp", "param set persist.sys.suspend_manager_enabled 1", "reboot", "hilog -b X -D 0xD002B70", -- GitLab