From 7894474cf9a2644682428d4f360c5ea8e71ad4cb Mon Sep 17 00:00:00 2001 From: Dominik Ermel Date: Sat, 9 Mar 2024 22:21:20 +0000 Subject: [PATCH] tests/settings: Move from flash_area_erase to flash_area_flatten The Settings test wipe out areas to have a start clean, so flash_arae_flatten will do that form them for program-erase and no-erase devices. Signed-off-by: Dominik Ermel --- tests/subsys/settings/fcb/src/settings_test_fcb.c | 2 +- tests/subsys/settings/fcb_init/src/settings_test_fcb_init.c | 2 +- tests/subsys/settings/file/src/settings_setup_littlefs.c | 2 +- tests/subsys/settings/functional/src/settings_basic_test.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/subsys/settings/fcb/src/settings_test_fcb.c b/tests/subsys/settings/fcb/src/settings_test_fcb.c index fdc2b7b8aac..1b3097c6f8b 100644 --- a/tests/subsys/settings/fcb/src/settings_test_fcb.c +++ b/tests/subsys/settings/fcb/src/settings_test_fcb.c @@ -193,7 +193,7 @@ void config_wipe_fcb(struct flash_sector *fs, int cnt) rc = flash_area_open(TEST_PARTITION_ID, &fap); for (i = 0; i < cnt; i++) { - rc = flash_area_erase(fap, fs[i].fs_off, fs[i].fs_size); + rc = flash_area_flatten(fap, fs[i].fs_off, fs[i].fs_size); zassert_true(rc == 0, "Can't get flash area"); } } diff --git a/tests/subsys/settings/fcb_init/src/settings_test_fcb_init.c b/tests/subsys/settings/fcb_init/src/settings_test_fcb_init.c index 964fc87c166..8e3be17c4b3 100644 --- a/tests/subsys/settings/fcb_init/src/settings_test_fcb_init.c +++ b/tests/subsys/settings/fcb_init/src/settings_test_fcb_init.c @@ -110,7 +110,7 @@ void test_prepare_storage(void) err = flash_area_open(TEST_PARTITION_ID, &fa); zassert_true(err == 0, "Can't open storage flash area"); - err = flash_area_erase(fa, 0, fa->fa_size); + err = flash_area_flatten(fa, 0, fa->fa_size); zassert_true(err == 0, "Can't erase storage flash area"); err = flash_area_open(CODE_PARTITION_ID, &fa); diff --git a/tests/subsys/settings/file/src/settings_setup_littlefs.c b/tests/subsys/settings/file/src/settings_setup_littlefs.c index 2e2beb8bcee..5e1705b876b 100644 --- a/tests/subsys/settings/file/src/settings_setup_littlefs.c +++ b/tests/subsys/settings/file/src/settings_setup_littlefs.c @@ -29,7 +29,7 @@ void *config_setup_fs(void) rc = flash_area_open(LITTLEFS_PARTITION_ID, &fap); zassume_true(rc == 0, "opening flash area for erase [%d]\n", rc); - rc = flash_area_erase(fap, 0, fap->fa_size); + rc = flash_area_flatten(fap, 0, fap->fa_size); zassume_true(rc == 0, "erasing flash area [%d]\n", rc); rc = fs_mount(&littlefs_mnt); diff --git a/tests/subsys/settings/functional/src/settings_basic_test.c b/tests/subsys/settings/functional/src/settings_basic_test.c index 81d4934fbfa..5798605a5a7 100644 --- a/tests/subsys/settings/functional/src/settings_basic_test.c +++ b/tests/subsys/settings/functional/src/settings_basic_test.c @@ -45,7 +45,7 @@ ZTEST(settings_functional, test_clear_settings) rc = flash_area_open(TEST_FLASH_AREA_ID, &fap); if (rc == 0) { - rc = flash_area_erase(fap, 0, fap->fa_size); + rc = flash_area_flatten(fap, 0, fap->fa_size); flash_area_close(fap); } zassert_true(rc == 0, "clear settings failed");