You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ch...@apache.org on 2024/02/12 23:36:25 UTC
(couchdb) 24/28: Handle delta in fabric rpc tests
This is an automated email from the ASF dual-hosted git repository.
chewbranca pushed a commit to branch couch-stats-resource-tracker-rebase
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit 15cd6d21a49b2e65db009020f563c6ec8a745b6d
Author: Russell Branca <ch...@apache.org>
AuthorDate: Mon Dec 18 16:13:44 2023 -0800
Handle delta in fabric rpc tests
---
src/fabric/test/eunit/fabric_rpc_purge_tests.erl | 2 ++
src/fabric/test/eunit/fabric_rpc_tests.erl | 11 ++++++++++-
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/src/fabric/test/eunit/fabric_rpc_purge_tests.erl b/src/fabric/test/eunit/fabric_rpc_purge_tests.erl
index 07e6b1d42..c7a36fbe3 100644
--- a/src/fabric/test/eunit/fabric_rpc_purge_tests.erl
+++ b/src/fabric/test/eunit/fabric_rpc_purge_tests.erl
@@ -263,6 +263,8 @@ rpc_update_doc(DbName, Doc, Opts) ->
Reply = test_util:wait(fun() ->
receive
{Ref, Reply} ->
+ Reply;
+ {Ref, Reply, {delta, _}} ->
Reply
after 0 ->
wait
diff --git a/src/fabric/test/eunit/fabric_rpc_tests.erl b/src/fabric/test/eunit/fabric_rpc_tests.erl
index 16bb66bad..c402affba 100644
--- a/src/fabric/test/eunit/fabric_rpc_tests.erl
+++ b/src/fabric/test/eunit/fabric_rpc_tests.erl
@@ -101,7 +101,16 @@ t_no_config_db_create_fails_for_shard_rpc(DbName) ->
receive
Resp0 -> Resp0
end,
- ?assertMatch({Ref, {'rexi_EXIT', {{error, missing_target}, _}}}, Resp).
+ case couch_stats_resource_tracker:is_enabled() of
+ true ->
+ ?assertMatch( %% allow for {Ref, {rexi_EXIT, error}, {delta, D}}
+ {Ref, {'rexi_EXIT', {{error, missing_target}, _}}, _},
+ Resp);
+ false ->
+ ?assertMatch(
+ {Ref, {'rexi_EXIT', {{error, missing_target}, _}}},
+ Resp)
+ end.
t_db_create_with_config(DbName) ->
MDbName = mem3:dbname(DbName),