From 309ab1f43400f6f1cbd8182dc79326b8d9df37a4 Mon Sep 17 00:00:00 2001 From: wuliushuan Date: Fri, 30 Jun 2023 08:10:57 +0000 Subject: [PATCH 1/2] token_info file add sn flag Signed-off-by: wuliushuan Change-Id: I28e07cdcb93d6efc7844008fc54e06697b15294f --- cases/smoke/basic/screenshot32/acls_check/acl_check.py | 10 +++++----- cases/smoke/basic/screenshot32/acls_check/config.py | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cases/smoke/basic/screenshot32/acls_check/acl_check.py b/cases/smoke/basic/screenshot32/acls_check/acl_check.py index 7f9238d..61fd363 100644 --- a/cases/smoke/basic/screenshot32/acls_check/acl_check.py +++ b/cases/smoke/basic/screenshot32/acls_check/acl_check.py @@ -52,11 +52,11 @@ def main(sn): set_log_content(LogLevel(2).name, log_tag, '-------------------------- ACL check begin --------------------------') try: - hdc_command(GENERATING_TOKEN_INFO_COMMAND.format(sn, TOKEN_INFO_URL)) - hdc_command(DOWNLOAD_TOKEN_INFO_COMMAND.format(sn, TOKEN_INFO_URL, DOWNLOAD_TOKEN_INFO_URL)) - hdc_command(CLEAR_TOKEN_INFO_FILE.format(sn, TOKEN_INFO_URL)) - file = read_txt(DOWNLOAD_TOKEN_INFO_URL) - clear_token_info_txt(DOWNLOAD_TOKEN_INFO_URL) + hdc_command(GENERATING_TOKEN_INFO_COMMAND.format(sn, TOKEN_INFO_URL.format(sn))) + hdc_command(DOWNLOAD_TOKEN_INFO_COMMAND.format(sn, TOKEN_INFO_URL.format(sn), DOWNLOAD_TOKEN_INFO_URL.format(sn))) + hdc_command(CLEAR_TOKEN_INFO_FILE.format(sn, TOKEN_INFO_URL.format(sn))) + file = read_txt(DOWNLOAD_TOKEN_INFO_URL.format(sn)) + clear_token_info_txt(DOWNLOAD_TOKEN_INFO_URL.format(sn)) acls_dict = check_and_get(file) acl_whitelist = read_json(PATH + 'acl_whitelist.json') whitelist = get_acl_dict(acl_whitelist) diff --git a/cases/smoke/basic/screenshot32/acls_check/config.py b/cases/smoke/basic/screenshot32/acls_check/config.py index 90ae558..ff0a630 100644 --- a/cases/smoke/basic/screenshot32/acls_check/config.py +++ b/cases/smoke/basic/screenshot32/acls_check/config.py @@ -24,7 +24,7 @@ PATH = os.path.dirname(os.path.realpath(__file__)) + SYS_SEQ # 脚本的执行日志 LOG_FILE = PATH + SYS_SEQ + "native_sa.log" # 设备上生成的token info 文件名 -TOKEN_INFO_NAME = 'token_info_{}.txt'.format(time.time_ns()) +TOKEN_INFO_NAME = 'token_info_'+ str(time.time_ns()) +'_{}.txt' # 设备上生成文件存放位置 TOKEN_INFO_URL = '/data/{}'.format(TOKEN_INFO_NAME) # 设备上文件生成命令 -- Gitee From b48494585095a21cd3a46d14be7148e87ce4c5d5 Mon Sep 17 00:00:00 2001 From: wuliushuan Date: Fri, 30 Jun 2023 09:01:54 +0000 Subject: [PATCH 2/2] local reserve token_info file Signed-off-by: wuliushuan Change-Id: I462c79d787a8313322b4cd5a960da5831bcd68bf --- cases/smoke/basic/screenshot32/acls_check/acl_check.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cases/smoke/basic/screenshot32/acls_check/acl_check.py b/cases/smoke/basic/screenshot32/acls_check/acl_check.py index 61fd363..3a12bb5 100644 --- a/cases/smoke/basic/screenshot32/acls_check/acl_check.py +++ b/cases/smoke/basic/screenshot32/acls_check/acl_check.py @@ -56,7 +56,7 @@ def main(sn): hdc_command(DOWNLOAD_TOKEN_INFO_COMMAND.format(sn, TOKEN_INFO_URL.format(sn), DOWNLOAD_TOKEN_INFO_URL.format(sn))) hdc_command(CLEAR_TOKEN_INFO_FILE.format(sn, TOKEN_INFO_URL.format(sn))) file = read_txt(DOWNLOAD_TOKEN_INFO_URL.format(sn)) - clear_token_info_txt(DOWNLOAD_TOKEN_INFO_URL.format(sn)) + # clear_token_info_txt(DOWNLOAD_TOKEN_INFO_URL.format(sn)) acls_dict = check_and_get(file) acl_whitelist = read_json(PATH + 'acl_whitelist.json') whitelist = get_acl_dict(acl_whitelist) -- Gitee