fix: use force arg

espressif · Feb 4, 2024 · 8b82053 · 8b82053
1 parent 21ef8d5
commit 8b82053
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 9 deletions.
diff --git a/pytest-embedded-arduino/pytest_embedded_arduino/serial.py b/pytest-embedded-arduino/pytest_embedded_arduino/serial.py
@@ -53,7 +53,7 @@ def flash(self) -> None:
 
         try:
             esptool.main(
-                ['--chip', self.app.target, 'write_flash', *flash_files, *flash_settings],
+                ['--chip', self.app.target, 'write_flash', *flash_files, *flash_settings, '--force'],
                 esp=self.esp,
             )
         except Exception:

diff --git a/pytest-embedded-idf/pytest_embedded_idf/serial.py b/pytest-embedded-idf/pytest_embedded_idf/serial.py
@@ -1,7 +1,6 @@
 import contextlib
 import hashlib
 import logging
-import os
 import tempfile
 from typing import Optional, TextIO, Union
 
@@ -132,7 +131,10 @@ def flash(self) -> None:
                     _args.append(f'--{k}')
             else:
                 _args.append(f'--{k}')
-                _args.append(str(v))
+                if k == 'after':
+                    _args.append('hard_reset')
+                else:
+                    _args.append(str(v))
 
         _args.append('write_flash')
 
@@ -147,11 +149,30 @@ def flash(self) -> None:
             )
             self.esp.connect()
 
-        for k, v in self.app.flash_args['flash_files'].items():
-            _args.append(str(k))
-            _args.append(os.path.join(self.app.binary_path, str(v)))
+        encrypt_files = []
+        flash_files = []
+        for file in self.app.flash_files:
+            if file.encrypted:
+                encrypt_files.append(hex(file.offset))
+                encrypt_files.append(str(file.file_path))
+            else:
+                flash_files.append(hex(file.offset))
+                flash_files.append(file.file_path)
+
+        if flash_files and encrypt_files:
+            _args.extend(flash_files)
+            _args.append('--encrypt-files')
+            _args.extend(encrypt_files)
+        else:
+            if flash_files:
+                _args.extend(flash_files)
+            else:
+                _args.append('--encrypt')
+                _args.extend(encrypt_files)
+
         _args.extend(self.app.flash_args['write_flash_args'])
 
+        _args.append('--force')
         esptool.main(_args, esp=self.esp)
 
         if self._meta:
@@ -211,7 +232,7 @@ def erase_partition(self, partition_name: str) -> None:
             address = self.app.partition_table[partition_name]['offset']
             size = self.app.partition_table[partition_name]['size']
             logging.info(f'Erasing the partition "{partition_name}" of size {size} at {address}')
-            esptool.main(['erase_region', str(address), str(size)], esp=self.esp)
+            esptool.main(['erase_region', str(address), str(size), '--force'], esp=self.esp)
         else:
             raise ValueError(f'partition name "{partition_name}" not found in app partition table')
 

diff --git a/pytest-embedded-serial-esp/pytest_embedded_serial_esp/serial.py b/pytest-embedded-serial-esp/pytest_embedded_serial_esp/serial.py
@@ -154,8 +154,10 @@ def decorator(func):
             def wrapper(self, *args, **kwargs):
                 with self.disable_redirect_thread():
                     with contextlib.redirect_stdout(self._q):
+                        settings = self.proc.get_settings()
                         self.esp.connect()
                         ret = func(self, *args, **kwargs)
+                        self.proc.apply_settings(settings)
                 return ret
 
             return wrapper
@@ -165,7 +167,6 @@ def wrapper(self, *args, **kwargs):
     def _start(self):
         self.hard_reset()
 
-    @use_esptool()
     def hard_reset(self):
         """Hard reset your espressif device"""
         self.esp.hard_reset()
@@ -174,7 +175,7 @@ def hard_reset(self):
     def erase_flash(self):
         """Erase the complete flash"""
         logging.info('Erasing the flash')
-        esptool.main(['erase_flash'], esp=self.esp)
+        esptool.main(['erase_flash', '--force'], esp=self.esp)
 
         if self._meta:
             self._meta.drop_port_app_cache(self.port)