From a15f5fa68fb2a8da42e1a3cd199a2d1e444b5014 Mon Sep 17 00:00:00 2001 From: Mikhail Uvarov Date: Thu, 17 Aug 2023 00:56:34 +0200 Subject: [PATCH 1/2] Wait for async writer to flush messages before removing archive --- big_tests/tests/mam_helper.erl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/big_tests/tests/mam_helper.erl b/big_tests/tests/mam_helper.erl index 730c398e16a..230c2c2840d 100644 --- a/big_tests/tests/mam_helper.erl +++ b/big_tests/tests/mam_helper.erl @@ -717,12 +717,16 @@ clean_archives(Config) -> false -> ok end, + %% Wait until messages are flushed before removing them + wait_for_parallel_writer(Config), [ok = delete_archive(S, U) || {S, U} <- SUs], %% Wait for archive to be empty [wait_for_archive_size(S, U, 0) || {S, U} <- SUs], Config. destroy_room(Config) -> + %% Wait until messages are flushed before removing them + wait_for_parallel_writer(Config), clean_room_archive(Config), muc_helper:destroy_room(Config). From 8e60c2d075f6adf3edac3871d03380720bf3f9eb Mon Sep 17 00:00:00 2001 From: Mikhail Uvarov Date: Thu, 17 Aug 2023 00:58:35 +0200 Subject: [PATCH 2/2] Remove unused mam_helper:set_wait_for_parallel_writer/2 --- big_tests/tests/mam_SUITE.erl | 1 - big_tests/tests/mam_helper.erl | 6 ------ 2 files changed, 7 deletions(-) diff --git a/big_tests/tests/mam_SUITE.erl b/big_tests/tests/mam_SUITE.erl index a6f244c40f6..3d7d1ee623c 100644 --- a/big_tests/tests/mam_SUITE.erl +++ b/big_tests/tests/mam_SUITE.erl @@ -207,7 +207,6 @@ run_set_and_get_prefs_case/4, muc_light_host/0, host_type/0, - set_wait_for_parallel_writer/2, config_opts/1 ]). diff --git a/big_tests/tests/mam_helper.erl b/big_tests/tests/mam_helper.erl index 230c2c2840d..11e2dd18079 100644 --- a/big_tests/tests/mam_helper.erl +++ b/big_tests/tests/mam_helper.erl @@ -54,7 +54,6 @@ start_alice_protected_room/1, start_alice_anonymous_room/1, maybe_wait_for_archive/1, - set_wait_for_parallel_writer/2, stanza_archive_request/2, stanza_text_search_archive_request/3, stanza_date_range_archive_request_not_empty/3, @@ -1107,11 +1106,6 @@ maybe_wait_for_archive(Config) -> timer:sleep(Value) end. -set_wait_for_parallel_writer(Type, Config) -> - Old = proplists:get_value(wait_for_parallel_writer, Config, []), - Config2 = proplists:delete(wait_for_parallel_writer, Config), - [{wait_for_parallel_writer, lists:usort([Type] ++ Old)}|Config2]. - wait_for_parallel_writer(Config) -> case ?config(wait_for_parallel_writer, Config) of undefined ->