espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-10 16:14:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

nvs_flash: Fix host test regressions

Browse Source 
Regression in 09d2c5daa6 - in some
cases the test fixture was out of scope by the time
nvs_flash_deinit_partition() was called in this test.
This commit is contained in:
Angus Gratton
2020-12-17 19:30:19 +11:00
parent b92c290e56
commit c553430b0c
1 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
components/nvs_flash/test_nvs_host/test_nvs.cpp
View File

@@ -1220,9 +1220,9 @@ TEST_CASE("nvs api tests, starting with random data in flash", "[nvs][long]")
nvs_close(handle_2); nvs_close(handle_2);
} }
nvs_close(handle_1); nvs_close(handle_1);
}
TEST_ESP_OK(nvs_flash_deinit_partition(NVS_DEFAULT_PART_NAME)); TEST_ESP_OK(nvs_flash_deinit_partition(f.part.get_partition_name()));
}
} }
extern "C" void nvs_dump(const char *partName); extern "C" void nvs_dump(const char *partName);
@@ -1519,17 +1519,16 @@ TEST_CASE("test recovery from sudden poweroff", "[long][nvs][recovery][monkey]")
gen.seed(seed); gen.seed(seed);
const size_t iter_count = 2000; const size_t iter_count = 2000;
PartitionEmulationFixture f(0, 10);
const uint32_t NVS_FLASH_SECTOR = 2;
const uint32_t NVS_FLASH_SECTOR_COUNT_MIN = 8;
f.emu.setBounds(NVS_FLASH_SECTOR, NVS_FLASH_SECTOR + NVS_FLASH_SECTOR_COUNT_MIN);
size_t totalOps = 0; size_t totalOps = 0;
int lastPercent = -1; int lastPercent = -1;
for (uint32_t errDelay = 0; ; ++errDelay) { for (uint32_t errDelay = 0; ; ++errDelay) {
INFO(errDelay); INFO(errDelay);
PartitionEmulationFixture f(0, 10);
const uint32_t NVS_FLASH_SECTOR = 2;
const uint32_t NVS_FLASH_SECTOR_COUNT_MIN = 8;
f.emu.setBounds(NVS_FLASH_SECTOR, NVS_FLASH_SECTOR + NVS_FLASH_SECTOR_COUNT_MIN);
f.emu.randomize(seed); f.emu.randomize(seed);
f.emu.clearStats(); f.emu.clearStats();
f.emu.failAfter(errDelay); f.emu.failAfter(errDelay);
@@ -1550,14 +1549,18 @@ TEST_CASE("test recovery from sudden poweroff", "[long][nvs][recovery][monkey]")
if (NVSPartitionManager::get_instance()->init_custom(&f.part, if (NVSPartitionManager::get_instance()->init_custom(&f.part,
NVS_FLASH_SECTOR, NVS_FLASH_SECTOR,
NVS_FLASH_SECTOR_COUNT_MIN) == ESP_OK) { NVS_FLASH_SECTOR_COUNT_MIN) == ESP_OK) {
auto res = ESP_ERR_FLASH_OP_FAIL;
if (nvs_open("namespace1", NVS_READWRITE, &handle) == ESP_OK) { if (nvs_open("namespace1", NVS_READWRITE, &handle) == ESP_OK) {
if(test.doRandomThings(handle, gen, count) != ESP_ERR_FLASH_OP_FAIL) { res = test.doRandomThings(handle, gen, count);
nvs_close(handle);
break;
}
nvs_close(handle); nvs_close(handle);
} }
TEST_ESP_OK(nvs_flash_deinit_partition(NVS_DEFAULT_PART_NAME)); TEST_ESP_OK(nvs_flash_deinit_partition(NVS_DEFAULT_PART_NAME));
if (res != ESP_ERR_FLASH_OP_FAIL) {
// This means we got to the end without an error due to f.emu.failAfter(), therefore errDelay
// is high enough that we're not triggering it any more, therefore we're done
break;
}
} }
TEST_ESP_OK(NVSPartitionManager::get_instance()->init_custom(&f.part, TEST_ESP_OK(NVSPartitionManager::get_instance()->init_custom(&f.part,
@@ -1575,6 +1578,7 @@ TEST_CASE("test recovery from sudden poweroff", "[long][nvs][recovery][monkey]")
TEST_ESP_OK(nvs_flash_deinit_partition(NVS_DEFAULT_PART_NAME)); TEST_ESP_OK(nvs_flash_deinit_partition(NVS_DEFAULT_PART_NAME));
} }
} }
TEST_CASE("test for memory leaks in open/set", "[leaks]") TEST_CASE("test for memory leaks in open/set", "[leaks]")
{ {
PartitionEmulationFixture f(0, 10); PartitionEmulationFixture f(0, 10);