database/pgbackrest
1
0
Fork 0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2025-11-08 03:22:25 +03:00
Code Activity

Wrap try in a do...while loop to make sure that no random else is attached to the main if block.

Browse Source
This commit is contained in:
David Steele
2017-11-19 16:30:23 -05:00
parent 9395ad7043
commit dc1a5c18ac
8 changed files with 56 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
test/src/module/common/errorTest.c
View File

@@ -11,7 +11,7 @@ bool testTryRecurseFinally = false;
void testTryRecurse()
{
TRY()
TRY_BEGIN()
{
testTryRecurseTotal++;
assert(errorContext.tryTotal == testTryRecurseTotal + 1);
@@ -26,6 +26,7 @@ void testTryRecurse()
{
testTryRecurseFinally = true;
}
TRY_END();
} // {uncoverable - function throws error, never returns}
/***********************************************************************************************************************************
@@ -40,13 +41,13 @@ void testRun()
}
// -----------------------------------------------------------------------------------------------------------------------------
if (testBegin("TRY() with no errors"))
if (testBegin("TRY with no errors"))
{
bool tryDone = false;
bool catchDone = false;
bool finallyDone = false;
TRY()
TRY_BEGIN()
{
assert(errorContext.tryTotal == 1);
tryDone = true;
@@ -60,6 +61,7 @@ void testRun()
assert(errorContext.tryList[1].state == errorStateFinal);
finallyDone = true;
}
TRY_END();
assert(tryDone);
assert(!catchDone);
@@ -68,31 +70,32 @@ void testRun()
}
// -----------------------------------------------------------------------------------------------------------------------------
if (testBegin("TRY() with multiple catches"))
if (testBegin("TRY with multiple catches"))
{
bool tryDone = false;
bool catchDone = false;
bool finallyDone = false;
TRY()
TRY_BEGIN()
{
assert(errorContext.tryTotal == 1);
TRY()
TRY_BEGIN()
{
assert(errorContext.tryTotal == 2);
TRY()
TRY_BEGIN()
{
assert(errorContext.tryTotal == 3);
TRY()
TRY_BEGIN()
{
assert(errorContext.tryTotal == 4);
tryDone = true;
THROW(AssertError, BOGUS_STR);
}
TRY_END();
}
CATCH(AssertError)
{
@@ -103,11 +106,13 @@ void testRun()
{
finallyDone = true;
}
TRY_END();
}
CATCH_ANY()
{
RETHROW();
}
TRY_END();
}
CATCH(MemoryError)
{
@@ -120,6 +125,7 @@ void testRun()
catchDone = true;
}
TRY_END();
assert(tryDone);
assert(catchDone);
@@ -134,7 +140,7 @@ void testRun()
bool catchDone = false;
bool finallyDone = false;
TRY()
TRY_BEGIN()
{
tryDone = true;
testTryRecurse();
@@ -155,6 +161,7 @@ void testRun()
{
finallyDone = true;
}
TRY_END();
assert(tryDone);
assert(catchDone);