From bf4320ba681b260cb10e11881f822010a9156aa1 Mon Sep 17 00:00:00 2001 From: Omar Chebib Date: Mon, 28 Dec 2020 14:09:20 +0800 Subject: [PATCH] ci: fix flasher_args.json parser (iterate over dictionary) Closes IDFCI-347 --- tools/ci/python_packages/ttfw_idf/IDFApp.py | 6 +++--- tools/ci/python_packages/ttfw_idf/IDFDUT.py | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/ci/python_packages/ttfw_idf/IDFApp.py b/tools/ci/python_packages/ttfw_idf/IDFApp.py index df72af0e27..fde49cefa0 100644 --- a/tools/ci/python_packages/ttfw_idf/IDFApp.py +++ b/tools/ci/python_packages/ttfw_idf/IDFApp.py @@ -30,7 +30,7 @@ except ImportError: def parse_encrypted_flag(args, offs, binary): # Find partition entries (e.g. the entries with an offset and a file) - for _, entry in args: + for _, entry in args.items(): # If the current entry is a partition, we have to check whether it is # the one we are looking for or not try: @@ -279,7 +279,7 @@ class IDFApp(App.BaseApp): (Called from constructor) - Returns (flash_files, flash_settings) + Returns (flash_files, encrypt_files, flash_settings) """ if self.IDF_FLASH_ARGS_FILE in os.listdir(self.binary_path): @@ -302,7 +302,7 @@ class IDFApp(App.BaseApp): # All files must be encrypted is both file lists are the same flash_settings["encrypt"] = sorted(flash_files) == sorted(encrypt_files) - return self._int_offs_abs_paths(flash_files), self._int_offs_abs_paths(encrypt_files), self.flash_settings + return self._int_offs_abs_paths(flash_files), self._int_offs_abs_paths(encrypt_files), flash_settings def _parse_partition_table(self): """ diff --git a/tools/ci/python_packages/ttfw_idf/IDFDUT.py b/tools/ci/python_packages/ttfw_idf/IDFDUT.py index 3bac0c04d6..aa62584d32 100644 --- a/tools/ci/python_packages/ttfw_idf/IDFDUT.py +++ b/tools/ci/python_packages/ttfw_idf/IDFDUT.py @@ -279,6 +279,7 @@ class IDFDUT(DUT.SerialDUT): 'compress': True, 'verify': False, 'encrypt': encrypt, + 'ignore_flash_encryption_efuse_setting': False, 'erase_all': False, })