Merge pull request #266 from espressif/fix/respect_sdkconfig_items_wh…

…ile_erase_flash
espressif · Mar 1, 2024 · 28a52c8 · 28a52c8
2 parents 491a429 + 71c602d
commit 28a52c8
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/pytest-embedded-idf/pytest_embedded_idf/serial.py b/pytest-embedded-idf/pytest_embedded_idf/serial.py
@@ -111,11 +111,24 @@ def load_ram(self) -> None:
     def _force_flag(self):
         if self.esp_flash_force:
             return ['--force']
-        config = self.app.sdkconfig
-        if any((config.get('SECURE_FLASH_ENC_ENABLED', False), config.get('SECURE_BOOT', False))):
+
+        if any(
+            (
+                self.app.sdkconfig.get('SECURE_FLASH_ENC_ENABLED', False),
+                self.app.sdkconfig.get('SECURE_BOOT', False),
+            )
+        ):
             return ['--force']
+
         return []
 
+    @EspSerial.use_esptool()
+    def erase_flash(self, force: bool = False):
+        if self._force_flag() or force:
+            super().erase_flash(force=True)
+        else:
+            super().erase_flash()
+
     @EspSerial.use_esptool()
     def flash(self) -> None:
         """

diff --git a/pytest-embedded-serial-esp/pytest_embedded_serial_esp/serial.py b/pytest-embedded-serial-esp/pytest_embedded_serial_esp/serial.py
@@ -174,11 +174,12 @@ def hard_reset(self):
         self.esp.hard_reset()
 
     @use_esptool()
-    def erase_flash(self):
+    def erase_flash(self, force: bool = False) -> None:
         """Erase the complete flash"""
         logging.info('Erasing the flash')
         options = ['erase_flash']
-        if self.esp_flash_force:
+
+        if force or self.esp_flash_force:
             options.append('--force')
 
         esptool.main(options, esp=self.esp)