diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2010-07-19 13:26:04 +0100 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2010-07-19 13:26:04 +0100 |
| commit | fee1562beec1e481fb281bce5d8e11c0320de1ab (patch) | |
| tree | d59e11b0c501a6ecf2b130f21afd639fba283a2e | |
| parent | 9c8a0bedf7df7665c0abb5c097e4397ad6879ad0 (diff) | |
| download | rabbitmq-server-fee1562beec1e481fb281bce5d8e11c0320de1ab.tar.gz | |
refactor: simplify msg_store tests
| -rw-r--r-- | src/rabbit_tests.erl | 33 |
1 files changed, 19 insertions, 14 deletions
diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl index b506784e..c1b52e68 100644 --- a/src/rabbit_tests.erl +++ b/src/rabbit_tests.erl @@ -1420,6 +1420,11 @@ msg_store_remove(Ids) -> [guid_bin(Guid)]) end, ok, Ids). +foreach_with_msg_store_client(Store, Ref, Fun, L) -> + rabbit_msg_store:client_terminate( + lists:foldl(fun (Guid, MSCState) -> Fun(Guid, Store, MSCState) end, + rabbit_msg_store:client_init(Store, Ref), L)). + test_msg_store() -> stop_msg_store(), ok = start_msg_store_empty(), @@ -1518,21 +1523,21 @@ test_msg_store() -> BigCount = trunc(100 * FileSize / (PayloadSizeBits div 8)), GuidsBig = [guid_bin(X) || X <- lists:seq(1, BigCount)], Payload = << 0:PayloadSizeBits >>, - ok = rabbit_msg_store:client_terminate( - lists:foldl( - fun (Guid, MSCStateN) -> - {ok, MSCStateM} = - rabbit_msg_store:write(?PERSISTENT_MSG_STORE, Guid, Payload, MSCStateN), - MSCStateM - end, rabbit_msg_store:client_init(?PERSISTENT_MSG_STORE, Ref), GuidsBig)), + ok = foreach_with_msg_store_client( + ?PERSISTENT_MSG_STORE, Ref, + fun (Guid, Store, MSCStateM) -> + {ok, MSCStateN} = + rabbit_msg_store:write(Store, Guid, Payload, MSCStateM), + MSCStateN + end, GuidsBig), %% now read them to ensure we hit the fast client-side reading - ok = rabbit_msg_store:client_terminate( - lists:foldl( - fun (Guid, MSCStateM) -> - {{ok, Payload}, MSCStateN} = - rabbit_msg_store:read(?PERSISTENT_MSG_STORE, Guid, MSCStateM), - MSCStateN - end, rabbit_msg_store:client_init(?PERSISTENT_MSG_STORE, Ref), GuidsBig)), + ok = foreach_with_msg_store_client( + ?PERSISTENT_MSG_STORE, Ref, + fun (Guid, Store, MSCStateM) -> + {{ok, Payload}, MSCStateN} = + rabbit_msg_store:read(Store, Guid, MSCStateM), + MSCStateN + end, GuidsBig), %% .., then 3s by 1... ok = msg_store_remove(lists:seq(BigCount, 1, -3)), %% .., then remove 3s by 2, from the young end first. This hits |