db/pgbackrest
1
0
Fork 0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2025-02-09 13:46:51 +02:00
Code Issues Releases Activity

Improve reporting of partial reads in server test harness.

Browse Source 
Previously partial reads would be reported as an EOF which was not very helpful.

Also update error formatting to make requests easier to compare.
This commit is contained in:
David Steele 2024-08-28 11:07:52 +07:00
parent 2ce01e57d3
commit c40dd5ae41
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
test/src/common/harnessServer.c
View File

@ -330,13 +330,21 @@ hrnServerRun(IoRead *const read, const HrnServerProtocol protocol, const unsigne
TRY_BEGIN()
{
ioRead(ioSessionIoReadP(serverSession), buffer);
// Read one byte at a time so we can error with partial data
Buffer *const bufferOne = bufNew(1);
for (size_t size = 1; size <= bufSize(buffer); size++)
{
ioReadSmall(ioSessionIoReadP(serverSession), bufferOne);
bufCat(buffer, bufferOne);
bufUsedZero(bufferOne);
}
}
CATCH(FileReadError)
{
// If nothing was read then throw the original error
if (bufEmpty(buffer))
THROW_FMT(AssertError, "server expected '%s' but got EOF", strZ(expected));
THROW_FMT(
AssertError, "server expected:\n'%s' but got short read:\n'%s'", strZ(expected), strZ(strNewBuf(buffer)));
}
TRY_END();
@ -351,7 +359,7 @@ hrnServerRun(IoRead *const read, const HrnServerProtocol protocol, const unsigne
// Error if actual does not match expected
if (!strEq(actual, expected))
THROW_FMT(AssertError, "server expected '%s' but got '%s'", strZ(expected), strZ(actual));
THROW_FMT(AssertError, "server expected:\n'%s' but got:\n'%s'", strZ(expected), strZ(actual));
break;
}