Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

tests: Fix suit test names clashes #18887

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
+16 −16
Draft

tests: Fix suit test names clashes #18887

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions tests/subsys/suit/orchestrator/orchestrator_sdfw/src/test_init.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ static void setup_boot_report(uint8_t *buf, size_t len)

ZTEST_SUITE(orchestrator_init_tests, NULL, NULL, NULL, NULL, NULL);

ZTEST(orchestrator_init_tests, test_empty_storage)
ZTEST(orchestrator_init_tests, test_orchestrator_sdfw_empty_storage)
{
/* GIVEN empty flash (suit storage is erased)... */
setup_erased_flash();
Expand All @@ -105,7 +105,7 @@ ZTEST(orchestrator_init_tests, test_empty_storage)
check_startup_failure();
}

ZTEST(orchestrator_init_tests, test_empty_storage_with_update_flag)
ZTEST(orchestrator_init_tests, test_orchestrator_sdfw_empty_storage_with_update_flag)
{
/* GIVEN empty flash (suit storage is erased)... */
setup_erased_flash();
Expand All @@ -131,7 +131,7 @@ ZTEST(orchestrator_init_tests, test_empty_storage_with_update_flag)
check_startup_failure();
}

ZTEST(orchestrator_init_tests, test_empty_storage_with_recovery_flag)
ZTEST(orchestrator_init_tests, test_orchestrator_sdfw_empty_storage_with_recovery_flag)
{
/* GIVEN empty flash (suit storage is erased)... */
setup_erased_flash();
Expand All @@ -157,7 +157,7 @@ ZTEST(orchestrator_init_tests, test_empty_storage_with_recovery_flag)
check_startup_failure();
}

ZTEST(orchestrator_init_tests, test_empty_storage_with_update_recovery_flag)
ZTEST(orchestrator_init_tests, test_orchestrator_sdfw_empty_storage_with_update_recovery_flag)
{
/* GIVEN empty flash (suit storage is erased)... */
setup_erased_flash();
Expand Down
16 changes: 8 additions & 8 deletions tests/subsys/suit/storage_nrf54h20/src/test_storage_init.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

ZTEST_SUITE(suit_storage_nrf54h20_init_tests, NULL, NULL, NULL, NULL, NULL);

ZTEST(suit_storage_nrf54h20_init_tests, test_empty_storage)
ZTEST(suit_storage_nrf54h20_init_tests, test_storage_init_empty_storage)
{
/* GIVEN the whole SUIT storage area is erased (unprovisioned device) */
erase_area_nordic();
Expand All @@ -36,7 +36,7 @@ ZTEST(suit_storage_nrf54h20_init_tests, test_empty_storage)
assert_nordic_classes();
}

ZTEST(suit_storage_nrf54h20_init_tests, test_empty_app_rad_with_digest)
ZTEST(suit_storage_nrf54h20_init_tests, test_storage_init_empty_app_rad_with_digest)
{
/* GIVEN the device is provisioned with empty application and radio MPI */
erase_area_nordic();
Expand Down Expand Up @@ -75,7 +75,7 @@ ZTEST(suit_storage_nrf54h20_init_tests, test_empty_app_rad_with_digest)
assert_nordic_classes();
}

ZTEST(suit_storage_nrf54h20_init_tests, test_with_root_rad)
ZTEST(suit_storage_nrf54h20_init_tests, test_storage_init_with_root_rad)
{
/* GIVEN the device is provisioned with application MPI with root config and sample radio
* MPI entry
Expand Down Expand Up @@ -118,7 +118,7 @@ ZTEST(suit_storage_nrf54h20_init_tests, test_with_root_rad)
assert_sample_root_rad_class();
}

ZTEST(suit_storage_nrf54h20_init_tests, test_with_root_rad_backup)
ZTEST(suit_storage_nrf54h20_init_tests, test_storage_init_with_root_rad_backup)
{
/* GIVEN the device was provisioned with application and radio MPI with root and sample
* radio config
Expand Down Expand Up @@ -162,7 +162,7 @@ ZTEST(suit_storage_nrf54h20_init_tests, test_with_root_rad_backup)
assert_sample_root_rad_class();
}

ZTEST(suit_storage_nrf54h20_init_tests, test_with_old_root_rad_backup)
ZTEST(suit_storage_nrf54h20_init_tests, test_storage_init_with_old_root_rad_backup)
{
/* GIVEN the device was provisioned with application MPI with old root and sample radio
* config
Expand Down Expand Up @@ -212,7 +212,7 @@ ZTEST(suit_storage_nrf54h20_init_tests, test_with_old_root_rad_backup)
assert_sample_root_rad_class();
}

ZTEST(suit_storage_nrf54h20_init_tests, test_app_with_old_root_new_rad_nvv_backup)
ZTEST(suit_storage_nrf54h20_init_tests, test_storage_init_app_with_old_root_new_rad_nvv_backup)
{
/* GIVEN the device was provisioned with application MPI with old root and sample radio
* config
Expand Down Expand Up @@ -261,7 +261,7 @@ ZTEST(suit_storage_nrf54h20_init_tests, test_app_with_old_root_new_rad_nvv_backu
assert_sample_root_rad_class();
}

ZTEST(suit_storage_nrf54h20_init_tests, test_app_corrupted_nvv)
ZTEST(suit_storage_nrf54h20_init_tests, test_storage_init_app_corrupted_nvv)
{
/* GIVEN the device is provisioned with application MPI with root config */
erase_area_nordic();
Expand Down Expand Up @@ -299,7 +299,7 @@ ZTEST(suit_storage_nrf54h20_init_tests, test_app_corrupted_nvv)
assert_sample_root_class();
}

ZTEST(suit_storage_nrf54h20_init_tests, test_app_corrupted_nvv_backup)
ZTEST(suit_storage_nrf54h20_init_tests, test_storage_init_app_corrupted_nvv_backup)
{
/* GIVEN the device is provisioned with application MPI with root config */
erase_area_nordic();
Expand Down
8 changes: 4 additions & 4 deletions tests/subsys/suit/storage_nrf54h20/src/test_storage_purge.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ static void assert_rad_purged(void)
SUIT_STORAGE_RAD_MPI_SIZE + SUIT_STORAGE_DIGEST_SIZE);
}

ZTEST(suit_storage_nrf54h20_bare_recovery_tests, test_populated_storage)
ZTEST(suit_storage_nrf54h20_bare_recovery_tests, test_storage_purge_populated_storage)
{
suit_plat_mreg_t update_candidate[1] = {{
.mem = (uint8_t *)0xCAFEFECA,
Expand Down Expand Up @@ -103,7 +103,7 @@ ZTEST(suit_storage_nrf54h20_bare_recovery_tests, test_populated_storage)
assert_only_nordic_classes();
}

ZTEST(suit_storage_nrf54h20_bare_recovery_tests, test_populated_storage_rad_first)
ZTEST(suit_storage_nrf54h20_bare_recovery_tests, test_storage_purge_populated_storage_rad_first)
{
suit_plat_mreg_t update_candidate[1] = {{
.mem = (uint8_t *)0xCAFEFECA,
Expand Down Expand Up @@ -201,7 +201,7 @@ ZTEST(suit_storage_nrf54h20_bare_recovery_tests, test_populated_storage_rad_firs
assert_only_nordic_classes();
}

ZTEST(suit_storage_nrf54h20_bare_recovery_tests, test_empty_storage)
ZTEST(suit_storage_nrf54h20_bare_recovery_tests, test_storage_purge_empty_storage)
{
/* GIVEN storage area is not initialized */
erase_area_nordic();
Expand Down Expand Up @@ -234,7 +234,7 @@ ZTEST(suit_storage_nrf54h20_bare_recovery_tests, test_empty_storage)
assert_only_nordic_classes();
}

ZTEST(suit_storage_nrf54h20_bare_recovery_tests, test_update_only)
ZTEST(suit_storage_nrf54h20_bare_recovery_tests, test_storage_purge_update_only)
{
suit_plat_mreg_t update_candidate[1] = {{
.mem = (uint8_t *)0xCAFEFECA,
Expand Down
Loading