# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1629023338 -7200
# Node ID e0d0680e04cc21a0d0050f2ac96eac13265a1658
# Parent  3f1450ec37f4c388cea2868884525f06f3467f5a
core.storagemanager: Respect archive ids issued by storage drivers in tests

Storage drivers may issue their own IDs tho none of the included ones do
this atm, but the 3rd party module mod_storage_xmlarchive has its
special format.

diff -r 3f1450ec37f4 -r e0d0680e04cc spec/core_storagemanager_spec.lua
--- a/spec/core_storagemanager_spec.lua	Sat Aug 14 13:07:29 2021 +0200
+++ b/spec/core_storagemanager_spec.lua	Sun Aug 15 12:28:58 2021 +0200
@@ -497,8 +497,9 @@
 				it("overwrites existing keys with new data", function ()
 					local prefix = ("a"):rep(50);
 					local username = "user-overwrite";
-					assert(archive:append(username, prefix.."-1", test_stanza, test_time, "contact@example.com"));
-					assert(archive:append(username, prefix.."-2", test_stanza, test_time, "contact@example.com"));
+					local a1 = assert(archive:append(username, prefix.."-1", test_stanza, test_time, "contact@example.com"));
+					local a2 = assert(archive:append(username, prefix.."-2", test_stanza, test_time, "contact@example.com"));
+					local ids = { a1, a2, };
 
 					do
 						local data = assert(archive:find(username, {}));
@@ -506,7 +507,7 @@
 						for id, item, when in data do --luacheck: ignore 213/when
 							count = count + 1;
 							assert.truthy(id);
-							assert.equals(("%s-%d"):format(prefix, count), id);
+							assert.equals(ids[count], id);
 							assert(st.is_stanza(item));
 						end
 						assert.equal(2, count);
@@ -514,7 +515,7 @@
 
 					local new_stanza = st.clone(test_stanza);
 					new_stanza.attr.foo = "bar";
-					assert(archive:append(username, prefix.."-2", new_stanza, test_time+1, "contact2@example.com"));
+					assert(archive:append(username, a2, new_stanza, test_time+1, "contact2@example.com"));
 
 					do
 						local data = assert(archive:find(username, {}));
@@ -522,7 +523,7 @@
 						for id, item, when in data do
 							count = count + 1;
 							assert.truthy(id);
-							assert.equals(("%s-%d"):format(prefix, count), id);
+							assert.equals(ids[count], id);
 							assert(st.is_stanza(item));
 							if count == 2 then
 								assert.equals(test_time+1, when);