Skip to content

Commit

Permalink
Merge branch 'fix/nvs_generator_test_fail_due_to_safer_write_namespac…
Browse files Browse the repository at this point in the history
…e_function_v5.4' into 'release/v5.4'

fix(nvs): Fix the NVS generator test (write_namespace safer behavior change) (v5.4)

See merge request espressif/esp-idf!34857
  • Loading branch information
pacucha42 committed Nov 12, 2024
2 parents 2900301 + 67ab814 commit 8ea7ae7
Showing 1 changed file with 8 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -201,13 +201,20 @@ def setup_bad_mixed_same_key_different_page(nvs_obj: NVS) -> None:
data_type = prim_types[i % len(prim_types)]
nvs_partition_gen.write_entry(nvs_obj, f'test_{i}', 'data', data_type, str(i)) # Conflicting keys under "abcd" namespace - 6 duplicates
nvs_partition_gen.write_entry(nvs_obj, 'lorem_string_key', 'data', 'string', 'abc') # Conflicting key for string - 7th duplicate
nvs_partition_gen.write_entry(nvs_obj, 'storage', 'namespace', '', '') # Conflicting namespace - 8th duplicate

# Create new duplicates of storage namespace with an unsafe version of write_namespace function
nvs_obj.write_namespace_unsafe('storage') # Conflicting namespace - 8th duplicate (the function is only for testing)

nvs_partition_gen.write_entry(nvs_obj, 'storage2', 'namespace', '', '') # New namespace, ignored
nvs_partition_gen.write_entry(nvs_obj, 'lorem_string_key', 'data', 'string', 'abc') # Should be ignored as is under different "storage2" namespace
nvs_partition_gen.write_entry(nvs_obj, 'lorem_string', 'data', 'string', 'abc') # 3 conflicting keys under "storage2" namespace - 9th duplicate
nvs_partition_gen.write_entry(nvs_obj, 'lorem_string', 'data', 'string', 'def')
nvs_partition_gen.write_entry(nvs_obj, 'lorem_string', 'data', 'string', '123')

# This no longer (nvs generator version >= 0.1.5) creates a duplicate namespace entry, only changes
# the current used namespace index
nvs_partition_gen.write_entry(nvs_obj, 'storage', 'namespace', '', '')


def setup_bad_same_key_primitive(nvs_obj: NVS) -> None:
nvs_partition_gen.write_entry(nvs_obj, 'storage', 'namespace', '', '')
Expand Down

0 comments on commit 8ea7ae7

Please sign in to comment.