Revert "[nrf fromlist] tests: zms: Add test coverage for ZMS_ID_64BIT"

This reverts commit fb385d5.

Signed-off-by: Grzegorz Swiderski <[email protected]>

Author: 57300

tests/subsys/fs/zms/src/main.c

@@ -578,18 +578,17 @@ ZTEST_F(zms, test_zms_gc_corrupt_close_ate)
 	int err;
 
 	Z_TEST_SKIP_IFNDEF(CONFIG_FLASH_SIMULATOR_DOUBLE_WRITES);
-	memset(&close_ate, 0xff, sizeof(struct zms_ate));
-	close_ate.id = ZMS_HEAD_ID;
+	close_ate.id = 0xffffffff;
 	close_ate.offset = fixture->fs.sector_size - sizeof(struct zms_ate) * 5;
 	close_ate.len = 0;
+	close_ate.metadata = 0xffffffff;
 	close_ate.cycle_cnt = 1;
 	close_ate.crc8 = 0xff; /* Incorrect crc8 */
 
-	memset(&empty_ate, 0, sizeof(struct zms_ate));
-	empty_ate.id = ZMS_HEAD_ID;
+	empty_ate.id = 0xffffffff;
+	empty_ate.offset = 0;
 	empty_ate.len = 0xffff;
-	empty_ate.metadata =
-		FIELD_PREP(ZMS_MAGIC_NUMBER_MASK, ZMS_MAGIC_NUMBER) | ZMS_DEFAULT_VERSION;
+	empty_ate.metadata = 0x4201;
 	empty_ate.cycle_cnt = 1;
 	empty_ate.crc8 =
 		crc8_ccitt(0xff, (uint8_t *)&empty_ate + SIZEOF_FIELD(struct zms_ate, crc8),
@@ -650,7 +649,7 @@ ZTEST_F(zms, test_zms_gc_corrupt_ate)
 	struct zms_ate close_ate;
 	int err;
 
-	close_ate.id = ZMS_HEAD_ID;
+	close_ate.id = 0xffffffff;
 	close_ate.offset = fixture->fs.sector_size / 2;
 	close_ate.len = 0;
 	close_ate.crc8 =
@@ -897,45 +896,3 @@ ZTEST_F(zms, test_zms_cache_hash_quality)
 	ztest_test_skip();
 #endif
 }
-
-/*
- * Test 64 bit ZMS ID support.
- */
-ZTEST_F(zms, test_zms_id_64bit)
-{
-	int err;
-	ssize_t len;
-	uint64_t data;
-	uint64_t filling_id = 0xdeadbeefULL;
-
-	Z_TEST_SKIP_IFNDEF(CONFIG_ZMS_ID_64BIT);
-
-	err = zms_mount(&fixture->fs);
-	zassert_true(err == 0, "zms_mount call failure: %d", err);
-
-	/* Fill the first sector with writes of different IDs */
-
-	while (fixture->fs.data_wra + sizeof(data) + sizeof(struct zms_ate) <=
-	       fixture->fs.ate_wra) {
-		data = filling_id;
-		len = zms_write(&fixture->fs, (zms_id_t)filling_id, &data, sizeof(data));
-		zassert_true(len == sizeof(data), "zms_write failed: %d", len);
-
-		/* Choose the next ID so that its lower 32 bits stay invariant.
-		 * The purpose is to test that ZMS doesn't mistakenly cast the
-		 * 64 bit ID to a 32 bit one somewhere.
-		 */
-		filling_id += BIT64(32);
-	}
-
-	/* Read back the written entries and check that they're all unique */
-
-	for (uint64_t id = 0xdeadbeefULL; id < filling_id; id += BIT64(32)) {
-		len = zms_read_hist(&fixture->fs, (zms_id_t)id, &data, sizeof(data), 0);
-		zassert_true(len == sizeof(data), "zms_read_hist unexpected failure: %d", len);
-		zassert_equal(data, id, "read unexpected data: %llx instead of %llx", data, id);
-
-		len = zms_read_hist(&fixture->fs, (zms_id_t)id, &data, sizeof(data), 1);
-		zassert_true(len == -ENOENT, "zms_read_hist unexpected failure: %d", len);
-	}
-}

tests/subsys/fs/zms/testcase.yaml

@@ -27,10 +27,3 @@ tests:
     platform_allow:
       - native_sim
       - qemu_x86
-  filesystem.zms.id_64bit:
-    extra_configs:
-      - CONFIG_ZMS_ID_64BIT=y
-      - CONFIG_ZMS_LOOKUP_CACHE=y
-      - CONFIG_ZMS_LOOKUP_CACHE_SIZE=64
-      - CONFIG_FLASH_SIMULATOR_DOUBLE_WRITES=y
-    platform_allow: qemu_x86