diff --git a/cases/smoke/basic/screenshot32/acls_check/acl_check.py b/cases/smoke/basic/screenshot32/acls_check/acl_check.py index 7f9238d655d7f4c191878311b35820e665535de3..3a12bb584488946f92b88447680ffc4af15933d6 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 90ae55855708654c3c9b0f8ffdbc70d1eb849efd..ff0a63065d272d27055c8fb55c64c90036bddacc 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) # 设备上文件生成命令