db/pgbackrest
1
0
Fork 0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2025-03-03 14:52:21 +02:00
Code Issues Releases Activity

Remove extra spaces.

Browse Source
This commit is contained in:
David Steele 2022-01-18 17:40:53 -05:00
parent f84909f85f
commit e21ba7c92b
24 changed files with 54 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/command/backup/backup.c
View File

@ -1801,11 +1801,11 @@ backupProcess(BackupData *backupData, Manifest *manifest, const String *lsnStart
// If hardlinking is enabled then create a hardlink for files that have not changed since the last backup
if (hardLink)
{
LOG_DETAIL_FMT("hardlink %s to %s", strZ(file->name), strZ(file->reference));
LOG_DETAIL_FMT("hardlink %s to %s", strZ(file->name), strZ(file->reference));
const String *const linkName = storagePathP(
storageRepo(), strNewFmt("%s/%s%s", strZ(backupPathExp), strZ(file->name), compressExt));
const String *const linkDestination = storagePathP(
const String *const linkDestination = storagePathP(
storageRepo(),
strNewFmt(STORAGE_REPO_BACKUP "/%s/%s%s", strZ(file->reference), strZ(file->name), compressExt));
@ -2157,7 +2157,7 @@ cmdBackup(void)
// Backup info
LOG_INFO_FMT(
"%s backup size = %s, file total = %u", strZ(strIdToStr(manifestData(manifest)->backupType)),
strZ(strSizeFormat(infoBackupDataByLabel(infoBackup, manifestData(manifest)->backupLabel)->backupInfoSizeDelta)),
strZ(strSizeFormat(infoBackupDataByLabel(infoBackup, manifestData(manifest)->backupLabel)->backupInfoSizeDelta)),
manifestFileTotal(manifest));
}
MEM_CONTEXT_TEMP_END();

2
src/command/backup/file.c
View File

@ -53,7 +53,7 @@ backupFile(
FUNCTION_LOG_PARAM(STRING, repoFile); // Destination in the repo to copy the pg file
FUNCTION_LOG_PARAM(BOOL, repoFileHasReference); // Does the repo file exist in a prior backup in the set?
FUNCTION_LOG_PARAM(ENUM, repoFileCompressType); // Compress type for repo file
FUNCTION_LOG_PARAM(INT, repoFileCompressLevel); // Compression level for repo file
FUNCTION_LOG_PARAM(INT, repoFileCompressLevel); // Compression level for repo file
FUNCTION_LOG_PARAM(STRING, backupLabel); // Label of current backup
FUNCTION_LOG_PARAM(BOOL, delta); // Is the delta option on?
FUNCTION_LOG_PARAM(STRING_ID, cipherType); // Encryption type

2
src/command/control/stop.c
View File

@ -62,7 +62,7 @@ cmdStop(void)
// If we cannot open the lock file for any reason then warn and continue to next file
if ((fd = open(strZ(lockFile), O_RDONLY, 0)) == -1)
{
LOG_WARN_FMT( "unable to open lock file %s", strZ(lockFile));
LOG_WARN_FMT("unable to open lock file %s", strZ(lockFile));
continue;
}

2
src/command/expire/expire.c
View File

@ -157,7 +157,7 @@ expireAdhocBackup(InfoBackup *infoBackup, const String *backupLabel, unsigned in
// Log the expired backup list (prepend "set:" if there were any dependents that were also expired)
LOG_INFO_FMT(
"%s: expire adhoc backup %s%s", cfgOptionGroupName(cfgOptGrpRepo, repoIdx), (result > 1 ? "set " : ""),
"%s: expire adhoc backup %s%s", cfgOptionGroupName(cfgOptGrpRepo, repoIdx), (result > 1 ? "set " : ""),
strZ(strLstJoin(backupExpired, ", ")));
}
MEM_CONTEXT_TEMP_END();

2
src/command/restore/restore.c
View File

@ -261,7 +261,7 @@ restoreBackupSet(void)
TRY_BEGIN()
{
infoBackup = infoBackupLoadFile(
storageRepoIdx(repoIdx), INFO_BACKUP_PATH_FILE_STR, cfgOptionIdxStrId(cfgOptRepoCipherType, repoIdx),
storageRepoIdx(repoIdx), INFO_BACKUP_PATH_FILE_STR, cfgOptionIdxStrId(cfgOptRepoCipherType, repoIdx),
cfgOptionIdxStrNull(cfgOptRepoCipherPass, repoIdx));
}
CATCH_ANY()

2
src/common/io/http/response.c
View File

@ -309,7 +309,7 @@ httpResponseNew(HttpSession *session, const String *verb, bool contentCache)
if (this->contentChunked && this->contentSize > 0)
{
THROW_FMT(
FormatError, "'%s' and '%s' headers are both set", HTTP_HEADER_TRANSFER_ENCODING,
FormatError, "'%s' and '%s' headers are both set", HTTP_HEADER_TRANSFER_ENCODING,
HTTP_HEADER_CONTENT_LENGTH);
}

2
src/common/io/tls/server.c
View File

@ -284,7 +284,7 @@ tlsServerNew(
OBJ_NEW_BEGIN(TlsServer)
{
TlsServer *const driver = OBJ_NEW_ALLOC();
TlsServer *const driver = OBJ_NEW_ALLOC();
*driver = (TlsServer)
{

4
src/common/log.h
View File

@ -153,12 +153,12 @@ Internal Functions (in virtually all cases the macros above should be used in pr
***********************************************************************************************************************************/
// Log function
void logInternal(
LogLevel logLevel, LogLevel logRangeMin, LogLevel logRangeMax, unsigned int processId, const char *fileName,
LogLevel logLevel, LogLevel logRangeMin, LogLevel logRangeMax, unsigned int processId, const char *fileName,
const char *functionName, int code, const char *message);
// Log function with formatting
void logInternalFmt(
LogLevel logLevel, LogLevel logRangeMin, LogLevel logRangeMax, unsigned int processId, const char *fileName,
LogLevel logLevel, LogLevel logRangeMin, LogLevel logRangeMax, unsigned int processId, const char *fileName,
const char *functionName, int code, const char *format, ...) __attribute__((format(printf, 8, 9)));
#endif

2
src/config/load.c
View File

@ -148,7 +148,7 @@ cfgLoadUpdateOption(void)
OptionInvalidValueError,
"'%s' is not valid for '" CFGOPT_PROTOCOL_TIMEOUT "' option\nHINT '" CFGOPT_PROTOCOL_TIMEOUT "' option (%s)"
" should be greater than '" CFGOPT_DB_TIMEOUT "' option (%s).",
strZ(cfgOptionDisplay(cfgOptProtocolTimeout)), strZ(cfgOptionDisplay(cfgOptProtocolTimeout)),
strZ(cfgOptionDisplay(cfgOptProtocolTimeout)), strZ(cfgOptionDisplay(cfgOptProtocolTimeout)),
strZ(cfgOptionDisplay(cfgOptDbTimeout)));
}
}

2
src/info/infoBackup.c
View File

@ -80,7 +80,7 @@ infoBackupNewInternal(void)
.pub =
{
.memContext = memContextCurrent(),
.backup = lstNewP(sizeof(InfoBackupData), .comparator = lstComparatorStr),
.backup = lstNewP(sizeof(InfoBackupData), .comparator = lstComparatorStr),
},
};

8
src/info/manifest.c
View File

@ -369,10 +369,10 @@ manifestNewInternal(void)
{
.memContext = memContextCurrent(),
.dbList = lstNewP(sizeof(ManifestDb), .comparator = lstComparatorStr),
.fileList = lstNewP(sizeof(ManifestFile), .comparator = lstComparatorStr),
.linkList = lstNewP(sizeof(ManifestLink), .comparator = lstComparatorStr),
.pathList = lstNewP(sizeof(ManifestPath), .comparator = lstComparatorStr),
.targetList = lstNewP(sizeof(ManifestTarget), .comparator = lstComparatorStr),
.fileList = lstNewP(sizeof(ManifestFile), .comparator = lstComparatorStr),
.linkList = lstNewP(sizeof(ManifestLink), .comparator = lstComparatorStr),
.pathList = lstNewP(sizeof(ManifestPath), .comparator = lstComparatorStr),
.targetList = lstNewP(sizeof(ManifestTarget), .comparator = lstComparatorStr),
},
.ownerList = strLstNew(),
.referenceList = strLstNew(),

2
src/storage/helper.c
View File

@ -144,7 +144,7 @@ storageLocal(void)
MEM_CONTEXT_BEGIN(storageHelper.memContext)
{
storageHelper.storageLocal = storagePosixNewP(FSLASH_STR);
storageHelper.storageLocal = storagePosixNewP(FSLASH_STR);
}
MEM_CONTEXT_END();
}

2
test/src/common/harnessPq.h
View File

@ -440,7 +440,7 @@ Macros for defining groups of functions that implement various queries and comma
sessionParam, walNameParam, lsnNameParam, targetLsnParam, targetReachedParam, replayLsnParam) \
{.session = sessionParam, \
.function = HRNPQ_SENDQUERY, \
.param = strZ(strNewFmt( \
.param = strZ(strNewFmt( \
"[\"select replayLsn::text,\\n" \
" (replayLsn > '%s')::bool as targetReached\\n" \
" from pg_catalog.pg_last_" walNameParam "_replay_" lsnNameParam "() as replayLsn\"]", targetLsnParam)), \

2
test/src/common/harnessStorage.c
View File

@ -449,7 +449,7 @@ hrnStoragePut(
// Add modified time to output information filter
if (param.timeModified != 0)
strCatFmt(filter, "%stime[%" PRIu64 "]", strEmpty(filter) ? "" : "/", (uint64_t)param.timeModified);
strCatFmt(filter, "%stime[%" PRIu64 "]", strEmpty(filter) ? "" : "/", (uint64_t)param.timeModified);
// Add compression filter
if (param.compressType != compressTypeNone)

2
test/src/module/command/backupCommonTest.c
View File

@ -72,7 +72,7 @@ testRun(void)
// -------------------------------------------------------------------------------------------------------------------------
TEST_TITLE("regular expression - match full, incremental, differential");
filter = backupRegExpP(.full = true, .incremental = true, .differential = true);
filter = backupRegExpP(.full = true, .incremental = true, .differential = true);
TEST_RESULT_STR_Z(
filter, "^[0-9]{8}\\-[0-9]{6}F(\\_[0-9]{8}\\-[0-9]{6}(D|I)){0,1}$",

4
test/src/module/command/infoTest.c
View File

@ -2536,7 +2536,7 @@ testRun(void)
"\n"
"[db:history]\n"
"1={\"db-id\":6569239123849665679,\"db-version\":\"9.5\"}\n",
.comment = "put archive info to file, repo2, same system-id, different version");
.comment = "put archive info to file, repo2, same system-id, different version");
HRN_STORAGE_PUT_EMPTY(
storageRepoIdxWrite(1), STORAGE_REPO_ARCHIVE
@ -2610,7 +2610,7 @@ testRun(void)
"\n"
"[db:history]\n"
"1={\"db-id\":6569239123849665888,\"db-version\":\"9.4\"}\n",
.comment = "put archive info to file, repo2, different system-id, same version");
.comment = "put archive info to file, repo2, different system-id, same version");
TEST_RESULT_STR_Z(
infoRender(),

2
test/src/module/command/stanzaTest.c
View File

@ -37,7 +37,7 @@ testRun(void)
TEST_TITLE("stanza-create: repo option not valid");
// Load Parameters
StringList *argList = strLstDup(argListBase);
StringList *argList = strLstDup(argListBase);
hrnCfgArgKeyRawZ(argList, cfgOptRepoPath, 2, TEST_PATH "/repo2");
hrnCfgArgRawZ(argList, cfgOptRepo, "2");

12
test/src/module/command/verifyTest.c
View File

@ -393,9 +393,9 @@ testRun(void)
VerifyArchiveResult archiveResult =
{
.archiveId = strNewZ("9.4-1"),
.walRangeList = lstNewP(sizeof(VerifyWalRange), .comparator = lstComparatorStr),
.walRangeList = lstNewP(sizeof(VerifyWalRange), .comparator = lstComparatorStr),
};
List *archiveIdResultList = lstNewP(sizeof(VerifyArchiveResult), .comparator = archiveIdComparator);
List *archiveIdResultList = lstNewP(sizeof(VerifyArchiveResult), .comparator = archiveIdComparator);
lstAdd(archiveIdResultList, &archiveResult);
VerifyArchiveResult *archiveIdResult = lstGetLast(archiveIdResultList);
@ -685,20 +685,20 @@ testRun(void)
//--------------------------------------------------------------------------------------------------------------------------
TEST_TITLE("verifyRender() - missing file, empty invalidList");
List *archiveIdResultList = lstNewP(sizeof(VerifyArchiveResult), .comparator = archiveIdComparator);
List *archiveIdResultList = lstNewP(sizeof(VerifyArchiveResult), .comparator = archiveIdComparator);
List *backupResultList = lstNewP(sizeof(VerifyBackupResult), .comparator = lstComparatorStr);
VerifyArchiveResult archiveIdResult =
{
.archiveId = strNewZ("9.6-1"),
.totalWalFile = 1,
.walRangeList = lstNewP(sizeof(VerifyWalRange), .comparator = lstComparatorStr),
.walRangeList = lstNewP(sizeof(VerifyWalRange), .comparator = lstComparatorStr),
};
VerifyWalRange walRange =
{
.start = strNewZ("0"),
.stop = strNewZ("2"),
.invalidFileList = lstNewP(sizeof(VerifyInvalidFile), .comparator = lstComparatorStr),
.invalidFileList = lstNewP(sizeof(VerifyInvalidFile), .comparator = lstComparatorStr),
};
lstAdd(archiveIdResult.walRangeList, &walRange);
@ -722,7 +722,7 @@ testRun(void)
.backupLabel = strNewZ("test-backup-label"),
.status = backupInvalid,
.totalFileVerify = 1,
.invalidFileList = lstNewP(sizeof(VerifyInvalidFile), .comparator = lstComparatorStr),
.invalidFileList = lstNewP(sizeof(VerifyInvalidFile), .comparator = lstComparatorStr),
};
lstAdd(backupResult.invalidFileList, &invalidFile);
lstAdd(backupResultList, &backupResult);

8
test/src/module/common/cryptoTest.c
View File

@ -106,11 +106,11 @@ testRun(void)
bufLimitSet(encryptBuffer, CIPHER_BLOCK_MAGIC_SIZE);
ioFilterProcessInOut(blockEncryptFilter, testPlainText, encryptBuffer);
TEST_RESULT_UINT(bufUsed(encryptBuffer), CIPHER_BLOCK_MAGIC_SIZE, "cipher size is magic size");
TEST_RESULT_BOOL(ioFilterInputSame(blockEncryptFilter), true, "filter needs same input");
TEST_RESULT_BOOL(ioFilterInputSame(blockEncryptFilter), true, "filter needs same input");
bufLimitSet(encryptBuffer, CIPHER_BLOCK_MAGIC_SIZE + PKCS5_SALT_LEN);
ioFilterProcessInOut(blockEncryptFilter, testPlainText, encryptBuffer);
TEST_RESULT_BOOL(ioFilterInputSame(blockEncryptFilter), false, "filter does not need same input");
TEST_RESULT_BOOL(ioFilterInputSame(blockEncryptFilter), false, "filter does not need same input");
TEST_RESULT_BOOL(blockEncrypt->saltDone, true, "salt done is true");
TEST_RESULT_BOOL(blockEncrypt->processDone, true, "process done is true");
@ -132,13 +132,13 @@ testRun(void)
TEST_RESULT_UINT(
bufUsed(encryptBuffer), CIPHER_BLOCK_HEADER_SIZE + (size_t)EVP_CIPHER_block_size(blockEncrypt->cipher),
"cipher size increases by one block");
TEST_RESULT_BOOL(ioFilterDone(blockEncryptFilter), false, "filter is not done");
TEST_RESULT_BOOL(ioFilterDone(blockEncryptFilter), false, "filter is not done");
ioFilterProcessInOut(blockEncryptFilter, NULL, encryptBuffer);
TEST_RESULT_UINT(
bufUsed(encryptBuffer), CIPHER_BLOCK_HEADER_SIZE + (size_t)(EVP_CIPHER_block_size(blockEncrypt->cipher) * 2),
"cipher size increases by one block on flush");
TEST_RESULT_BOOL(ioFilterDone(blockEncryptFilter), true, "filter is done");
TEST_RESULT_BOOL(ioFilterDone(blockEncryptFilter), true, "filter is done");
ioFilterFree(blockEncryptFilter);

24
test/src/module/common/ioHttpTest.c
View File

@ -525,7 +525,7 @@ testRun(void)
TEST_RESULT_BOOL(httpResponseEof(response), true, "io is eof");
TEST_RESULT_PTR(response->session, NULL, "session is not busy");
TEST_RESULT_STR_Z(
httpHeaderToLog(httpResponseHeader(response)), "{content-length: '380'}", "check response headers");
httpHeaderToLog(httpResponseHeader(response)), "{content-length: '380'}", "check response headers");
// -----------------------------------------------------------------------------------------------------------------
TEST_TITLE("head request with transfer encoding but no content");
@ -541,7 +541,7 @@ testRun(void)
TEST_RESULT_BOOL(httpResponseEof(response), true, "io is eof");
TEST_RESULT_PTR(response->session, NULL, "session is not busy");
TEST_RESULT_STR_Z(
httpHeaderToLog(httpResponseHeader(response)), "{transfer-encoding: 'chunked'}", "check response headers");
httpHeaderToLog(httpResponseHeader(response)), "{transfer-encoding: 'chunked'}", "check response headers");
// -----------------------------------------------------------------------------------------------------------------
TEST_TITLE("head request with connection close but no content");
@ -557,7 +557,7 @@ testRun(void)
TEST_RESULT_BOOL(httpResponseEof(response), true, "io is eof");
TEST_RESULT_PTR(response->session, NULL, "session is not busy");
TEST_RESULT_STR_Z(
httpHeaderToLog(httpResponseHeader(response)), "{connection: 'close'}", "check response headers");
httpHeaderToLog(httpResponseHeader(response)), "{connection: 'close'}", "check response headers");
// -----------------------------------------------------------------------------------------------------------------
TEST_TITLE("error with content (with a few slow down errors)");
@ -586,7 +586,7 @@ testRun(void)
TEST_RESULT_BOOL(httpResponseCodeOk(response), false, "check response code error");
TEST_RESULT_STR_Z(httpResponseReason(response), "Not Found", "check response message");
TEST_RESULT_STR_Z(
httpHeaderToLog(httpResponseHeader(response)), "{}", "check response headers");
httpHeaderToLog(httpResponseHeader(response)), "{}", "check response headers");
TEST_ERROR(
httpRequestError(request, response), ProtocolError,
@ -616,8 +616,8 @@ testRun(void)
TEST_RESULT_UINT(httpResponseCode(response), 403, "check response code");
TEST_RESULT_STR_Z(httpResponseReason(response), "", "check empty response message");
TEST_RESULT_STR_Z(
httpHeaderToLog(httpResponseHeader(response)), "{content-length: '7'}", "check response headers");
TEST_RESULT_STR_Z(strNewBuf(httpResponseContent(response)), "CONTENT", "check response content");
httpHeaderToLog(httpResponseHeader(response)), "{content-length: '7'}", "check response headers");
TEST_RESULT_STR_Z(strNewBuf(httpResponseContent(response)), "CONTENT", "check response content");
TEST_ERROR(
httpRequestError(request, response), ProtocolError,
@ -653,8 +653,8 @@ testRun(void)
.content = BUFSTRDEF("012345678901234567890123456789")), true),
"request");
TEST_RESULT_STR_Z(
httpHeaderToLog(httpResponseHeader(response)), "{connection: 'close'}", "check response headers");
TEST_RESULT_STR_Z(strNewBuf(httpResponseContent(response)), "01234567890123456789012345678901", "check response");
httpHeaderToLog(httpResponseHeader(response)), "{connection: 'close'}", "check response headers");
TEST_RESULT_STR_Z(strNewBuf(httpResponseContent(response)), "01234567890123456789012345678901", "check response");
TEST_RESULT_UINT(httpResponseRead(response, bufNew(1), true), 0, "call internal read to check eof");
// -----------------------------------------------------------------------------------------------------------------
@ -676,7 +676,7 @@ testRun(void)
httpRequestResponse(
httpRequestNewP(client, STRDEF("GET"), httpUriEncode(STRDEF("/path/file 1.txt"), true)), true),
"request");
TEST_RESULT_STR_Z(strNewBuf(httpResponseContent(response)), "01234567890123456789012345678901", "check response");
TEST_RESULT_STR_Z(strNewBuf(httpResponseContent(response)), "01234567890123456789012345678901", "check response");
TEST_RESULT_UINT(httpResponseRead(response, bufNew(1), true), 0, "call internal read to check eof");
// -----------------------------------------------------------------------------------------------------------------
@ -711,12 +711,12 @@ testRun(void)
TEST_ASSIGN(response, httpRequestResponse(httpRequestNewP(client, STRDEF("GET"), STRDEF("/")), false), "request");
TEST_RESULT_STR_Z(
httpHeaderToLog(httpResponseHeader(response)), "{transfer-encoding: 'chunked'}", "check response headers");
httpHeaderToLog(httpResponseHeader(response)), "{transfer-encoding: 'chunked'}", "check response headers");
Buffer *buffer = bufNew(35);
TEST_RESULT_VOID(ioRead(httpResponseIoRead(response), buffer), "read response");
TEST_RESULT_STR_Z(strNewBuf(buffer), "01234567890123456789012345678901012", "check response");
TEST_RESULT_VOID(ioRead(httpResponseIoRead(response), buffer), "read response");
TEST_RESULT_STR_Z(strNewBuf(buffer), "01234567890123456789012345678901012", "check response");
// -----------------------------------------------------------------------------------------------------------------
TEST_TITLE("close connection and end server process");

2
test/src/module/config/parseTest.c
View File

@ -320,7 +320,7 @@ testRun(void)
// Pass actual location of config files as "default" - not setting valueList above, so these are the only possible values
// to choose.
TEST_RESULT_STR_Z(
cfgFileLoad(storageTest, parseOptionList, configFile, configIncludePath, oldConfigDefault),
cfgFileLoad(storageTest, parseOptionList, configFile, configIncludePath, oldConfigDefault),
"[global]\n"
"compress-level=3\n"
"spool-path=/path/to/spool\n"

8
test/src/module/db/dbTest.c
View File

@ -69,7 +69,7 @@ testRun(void)
StringList *argList = strLstNew();
hrnCfgArgRawZ(argList, cfgOptStanza, "test1");
hrnCfgArgKeyRawZ(argList, cfgOptPgPath, 1, TEST_PATH "/pg");
hrnCfgArgKeyRawZ(argList, cfgOptPgDatabase, 1, "testdb");
hrnCfgArgKeyRawZ(argList, cfgOptPgDatabase, 1, "testdb");
hrnCfgArgRawStrId(argList, cfgOptRemoteType, protocolStorageTypePg);
hrnCfgArgRawZ(argList, cfgOptProcess, "0");
hrnCfgArgRawZ(argList, cfgOptDbTimeout, "777");
@ -124,8 +124,8 @@ testRun(void)
StringList *argList = strLstNew();
hrnCfgArgRawZ(argList, cfgOptStanza, "test1");
hrnCfgArgKeyRawZ(argList, cfgOptPgPath, 1, TEST_PATH "/pg");
hrnCfgArgKeyRawZ(argList, cfgOptPgDatabase, 1, "testdb");
hrnCfgArgKeyRawZ(argList, cfgOptRepoRetentionFull, 1, "1");
hrnCfgArgKeyRawZ(argList, cfgOptPgDatabase, 1, "testdb");
hrnCfgArgKeyRawZ(argList, cfgOptRepoRetentionFull, 1, "1");
HRN_CFG_LOAD(cfgCmdBackup, argList);
// Create control file
@ -200,7 +200,7 @@ testRun(void)
hrnCfgArgRawZ(argList, cfgOptStanza, "test1");
hrnCfgArgKeyRawZ(argList, cfgOptRepoRetentionFull, 1, "1");
hrnCfgArgKeyRawZ(argList, cfgOptPgPath, 1, TEST_PATH "/pg1");
hrnCfgArgKeyRawZ(argList, cfgOptPgDatabase, 1, "backupdb");
hrnCfgArgKeyRawZ(argList, cfgOptPgDatabase, 1, "backupdb");
hrnCfgArgRawZ(argList, cfgOptDbTimeout, "888");
HRN_CFG_LOAD(cfgCmdBackup, argList);

4
test/src/module/info/infoBackupTest.c
View File

@ -73,7 +73,7 @@ testRun(void)
TEST_ASSIGN(infoBackup, infoBackupNewLoad(ioBufferReadNew(contentCompare)), "load backup info");
TEST_RESULT_PTR(infoBackupPg(infoBackup), infoBackup->pub.infoPg, "infoPg set");
TEST_RESULT_STR(infoBackupCipherPass(infoBackup), NULL, "cipher sub not set");
TEST_RESULT_INT(infoBackupDataTotal(infoBackup), 0, "infoBackupDataTotal returns 0");
TEST_RESULT_INT(infoBackupDataTotal(infoBackup), 0, "infoBackupDataTotal returns 0");
// -------------------------------------------------------------------------------------------------------------------------
TEST_TITLE("check cipher pass");
@ -785,7 +785,7 @@ testRun(void)
"[target:path]\n"
"pg_data={}\n"
TEST_MANIFEST_PATH_DEFAULT,
.comment = "write manifest for dependent backup to be added to full already in backup.info");
.comment = "write manifest for dependent backup to be added to full already in backup.info");
TEST_RESULT_VOID(
infoBackupSaveFile(infoBackup, storageRepoWrite(), INFO_BACKUP_PATH_FILE_STR, cipherTypeNone, NULL),

2
test/src/module/storage/azureTest.c
View File

@ -462,7 +462,7 @@ testRun(void)
driver = (StorageAzure *)storageDriver(storage);
TEST_RESULT_STR(driver->host, hrnServerHost(), "check host");
TEST_RESULT_STR_Z(driver->pathPrefix, "/" TEST_ACCOUNT "/" TEST_CONTAINER, "check path prefix");
TEST_RESULT_STR_Z(driver->pathPrefix, "/" TEST_ACCOUNT "/" TEST_CONTAINER, "check path prefix");
TEST_RESULT_BOOL(driver->fileId == 0, false, "check file id");
// Tests need the block size to be 16