diff options
| author | Tom Rini <[email protected]> | 2023-07-18 09:55:32 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2023-07-18 09:55:32 -0400 |
| commit | 890233ca5569e5787d8407596a12b9fca80952bf (patch) | |
| tree | 966b9beb01a0ca57045bec4b4da2e16cb792757f /test/py | |
| parent | 13aa090b87a0fbdfe690011669b9fdb96bb1ccc7 (diff) | |
| parent | 4dc5e26242101f9090209e659e60422634c8bbcf (diff) | |
Merge branch '2023-07-17-assorted-updates'
- Merge in some Kconfig dependencies fixes, typo fixes, erofs update,
shell portability fix, an env save fix, better mbr+gpt support, and
some android A/B enhancements.
Diffstat (limited to 'test/py')
| -rw-r--r-- | test/py/tests/test_cat/conftest.py | 3 | ||||
| -rw-r--r-- | test/py/tests/test_xxd/conftest.py | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/test/py/tests/test_cat/conftest.py b/test/py/tests/test_cat/conftest.py index fc396f50d32..320e7ebd295 100644 --- a/test/py/tests/test_cat/conftest.py +++ b/test/py/tests/test_cat/conftest.py @@ -32,4 +32,5 @@ def cat_data(u_boot_config): pytest.skip('Setup failed') finally: shutil.rmtree(mnt_point) - os.remove(image_path) + if os.path.exists(image_path): + os.remove(image_path) diff --git a/test/py/tests/test_xxd/conftest.py b/test/py/tests/test_xxd/conftest.py index f35b8f11136..47c7cce1aa9 100644 --- a/test/py/tests/test_xxd/conftest.py +++ b/test/py/tests/test_xxd/conftest.py @@ -32,4 +32,5 @@ def xxd_data(u_boot_config): pytest.skip('Setup failed') finally: shutil.rmtree(mnt_point) - os.remove(image_path) + if os.path.exists(image_path): + os.remove(image_path) |