(couchdb) 08/11: improve assertion failure messages

[rnewson]

This is an automated email from the ASF dual-hosted git repository.

rnewson pushed a commit to branch decouple_offline_hash_strength_from_online
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit 821da84850dda7cd34bc299c9d07779e52aa5813
Author: Robert Newson <rnew...@apache.org>
AuthorDate: Tue Oct 24 09:15:44 2023 +0100

    improve assertion failure messages
---
 src/chttpd/test/eunit/chttpd_auth_hash_algorithms_tests.erl | 4 ++--
 src/chttpd/test/eunit/chttpd_auth_tests.erl                 | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/chttpd/test/eunit/chttpd_auth_hash_algorithms_tests.erl 
b/src/chttpd/test/eunit/chttpd_auth_hash_algorithms_tests.erl
index 52f4f9e8b..3085079ad 100644
--- a/src/chttpd/test/eunit/chttpd_auth_hash_algorithms_tests.erl
+++ b/src/chttpd/test/eunit/chttpd_auth_hash_algorithms_tests.erl
@@ -88,8 +88,8 @@ test_hash_algorithm([DefaultHashAlgorithm | 
DecodingHashAlgorithmsList] = _, Sta
         get_full_secret(?ADM_USER),
         CurrentTime
     ),
-    {ok, ReqStatus, _, _} = test_request:request(get, base_url(), [{cookie, 
Cookie}]),
-    ?assertEqual(Status, ReqStatus),
+    {ok, ReqStatus, Hdrs, Body} = test_request:request(get, base_url(), 
[{cookie, Cookie}]),
+    ?assertMatch({Status, _, _}, {ReqStatus, Hdrs, Body}),
     test_hash_algorithm(DecodingHashAlgorithmsList, Status).
 
 test_hash_algorithms_should_work({_, {WorkingHashes, _, 
SupportedHashAlgorithms}} = _) ->
diff --git a/src/chttpd/test/eunit/chttpd_auth_tests.erl 
b/src/chttpd/test/eunit/chttpd_auth_tests.erl
index 7e7b94a12..93ddb8cc6 100644
--- a/src/chttpd/test/eunit/chttpd_auth_tests.erl
+++ b/src/chttpd/test/eunit/chttpd_auth_tests.erl
@@ -194,9 +194,10 @@ test_hash_algorithm([DefaultHashAlgorithm | 
DecodingHashAlgorithmsList] = _) ->
         {"X-Auth-CouchDB-Roles", "PROXY-USER-ROLE1, PROXY-USER-ROLE2"},
         {"X-Auth-CouchDB-Token", Token}
     ],
-    {ok, _, _, ReqBody} = test_request:get(base_url() ++ "/_session", Headers),
+    {ok, RespStatus, _, RespBody} = test_request:get(base_url() ++ 
"/_session", Headers),
+    ?assertMatch({200, _}, {RespStatus, RespBody}),
     IsAuthenticatedViaProxy = couch_util:get_nested_json_value(
-        jiffy:decode(ReqBody), [<<"info">>, <<"authenticated">>]
+        jiffy:decode(RespBody), [<<"info">>, <<"authenticated">>]
     ),
     ?assertEqual(IsAuthenticatedViaProxy, <<"proxy">>),
     test_hash_algorithm(DecodingHashAlgorithmsList).