Skip to content

Commit fa1b670

Browse files
de-nordicrghaddab
authored andcommitted
[nrf fromtree] 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 <[email protected]> (cherry picked from commit 7894474)
1 parent edd1003 commit fa1b670

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

tests/subsys/settings/fcb/src/settings_test_fcb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ void config_wipe_fcb(struct flash_sector *fs, int cnt)
193193
rc = flash_area_open(TEST_PARTITION_ID, &fap);
194194

195195
for (i = 0; i < cnt; i++) {
196-
rc = flash_area_erase(fap, fs[i].fs_off, fs[i].fs_size);
196+
rc = flash_area_flatten(fap, fs[i].fs_off, fs[i].fs_size);
197197
zassert_true(rc == 0, "Can't get flash area");
198198
}
199199
}

tests/subsys/settings/fcb_init/src/settings_test_fcb_init.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ void test_prepare_storage(void)
110110
err = flash_area_open(TEST_PARTITION_ID, &fa);
111111
zassert_true(err == 0, "Can't open storage flash area");
112112

113-
err = flash_area_erase(fa, 0, fa->fa_size);
113+
err = flash_area_flatten(fa, 0, fa->fa_size);
114114
zassert_true(err == 0, "Can't erase storage flash area");
115115

116116
err = flash_area_open(CODE_PARTITION_ID, &fa);

tests/subsys/settings/file/src/settings_setup_littlefs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ void *config_setup_fs(void)
2929
rc = flash_area_open(LITTLEFS_PARTITION_ID, &fap);
3030
zassume_true(rc == 0, "opening flash area for erase [%d]\n", rc);
3131

32-
rc = flash_area_erase(fap, 0, fap->fa_size);
32+
rc = flash_area_flatten(fap, 0, fap->fa_size);
3333
zassume_true(rc == 0, "erasing flash area [%d]\n", rc);
3434

3535
rc = fs_mount(&littlefs_mnt);

tests/subsys/settings/functional/src/settings_basic_test.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ ZTEST(settings_functional, test_clear_settings)
4545
rc = flash_area_open(TEST_FLASH_AREA_ID, &fap);
4646

4747
if (rc == 0) {
48-
rc = flash_area_erase(fap, 0, fap->fa_size);
48+
rc = flash_area_flatten(fap, 0, fap->fa_size);
4949
flash_area_close(fap);
5050
}
5151
zassert_true(rc == 0, "clear settings failed");

0 commit comments

Comments
 (0)