db/pgbackrest
1
0
Fork 0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2025-07-15 01:04:37 +02:00
Code Issues Releases Activity

Remove last vestiges of key replacement missed in b270253a.

Browse Source
This commit is contained in:
David Steele
2021-07-15 13:19:49 -04:00
parent 563d117967
commit 4a6ca54b47
2 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/src/common/harnessTest.h
View File

@ -205,10 +205,6 @@ Macros to compare results of common data types
TEST_RESULT_Z(strZNull(statement), strZNull(resultExpected), comment) TEST_RESULT_Z(strZNull(statement), strZNull(resultExpected), comment)
#define TEST_RESULT_STR_Z(statement, resultExpected, comment) \ #define TEST_RESULT_STR_Z(statement, resultExpected, comment) \
TEST_RESULT_Z(strZNull(statement), resultExpected, comment) TEST_RESULT_Z(strZNull(statement), resultExpected, comment)
#define TEST_RESULT_STR_KEYRPL(statement, resultExpected, comment) \
TEST_RESULT_Z(strZNull(statement), strZ(resultExpected), comment)
#define TEST_RESULT_STR_Z_KEYRPL(statement, resultExpected, comment) \
TEST_RESULT_Z(strZNull(statement), resultExpected, comment)
#define TEST_RESULT_Z_STR(statement, resultExpected, comment) \ #define TEST_RESULT_Z_STR(statement, resultExpected, comment) \
TEST_RESULT_Z(statement, strZNull(resultExpected), comment) TEST_RESULT_Z(statement, strZNull(resultExpected), comment)

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

@ -1690,7 +1690,7 @@ testRun(void)
"P00 INFO: backup stop archive = 0000000105D944C000000000, lsn = 5d944c0/800000\n" "P00 INFO: backup stop archive = 0000000105D944C000000000, lsn = 5d944c0/800000\n"
"P00 INFO: new backup label = 20191002-070640F"); "P00 INFO: new backup label = 20191002-070640F");
TEST_RESULT_STR_Z_KEYRPL( TEST_RESULT_STR_Z(
testBackupValidate(storageRepo(), STRDEF(STORAGE_REPO_BACKUP "/latest")), testBackupValidate(storageRepo(), STRDEF(STORAGE_REPO_BACKUP "/latest")),
". {link, d=20191002-070640F}\n" ". {link, d=20191002-070640F}\n"
"pg_data {path}\n" "pg_data {path}\n"
@ -1864,7 +1864,7 @@ testRun(void)
"P00 DETAIL: copy segment 0000000105D95D3000000000 to backup\n" "P00 DETAIL: copy segment 0000000105D95D3000000000 to backup\n"
"P00 INFO: new backup label = 20191003-105320F"); "P00 INFO: new backup label = 20191003-105320F");
TEST_RESULT_STR_Z_KEYRPL( TEST_RESULT_STR_Z(
testBackupValidate(storageRepo(), STRDEF(STORAGE_REPO_BACKUP "/latest")), testBackupValidate(storageRepo(), STRDEF(STORAGE_REPO_BACKUP "/latest")),
". {link, d=20191003-105320F}\n" ". {link, d=20191003-105320F}\n"
"pg_data {path}\n" "pg_data {path}\n"
@ -2030,7 +2030,7 @@ testRun(void)
"P00 INFO: new backup label = 20191003-105320F_20191004-144000D"); "P00 INFO: new backup label = 20191003-105320F_20191004-144000D");
// Check repo directory // Check repo directory
TEST_RESULT_STR_Z_KEYRPL( TEST_RESULT_STR_Z(
testBackupValidate(storageRepo(), STRDEF(STORAGE_REPO_BACKUP "/latest")), testBackupValidate(storageRepo(), STRDEF(STORAGE_REPO_BACKUP "/latest")),
". {link, d=20191003-105320F_20191004-144000D}\n" ". {link, d=20191003-105320F_20191004-144000D}\n"
"pg_data {path}\n" "pg_data {path}\n"
@ -2160,7 +2160,7 @@ testRun(void)
TEST_RESULT_LOG( TEST_RESULT_LOG(
"P00 WARN: no prior backup exists, incr backup has been changed to full"); "P00 WARN: no prior backup exists, incr backup has been changed to full");
TEST_RESULT_STR_Z_KEYRPL( TEST_RESULT_STR_Z(
testBackupValidate(storageRepo(), STRDEF(STORAGE_REPO_BACKUP "/latest")), testBackupValidate(storageRepo(), STRDEF(STORAGE_REPO_BACKUP "/latest")),
". {link, d=20191016-042640F}\n" ". {link, d=20191016-042640F}\n"
"pg_data {path}\n" "pg_data {path}\n"
@ -2354,7 +2354,7 @@ testRun(void)
"P00 DETAIL: copy segment 0000000105DB5DE000000002 to backup\n" "P00 DETAIL: copy segment 0000000105DB5DE000000002 to backup\n"
"P00 INFO: new backup label = 20191027-181320F"); "P00 INFO: new backup label = 20191027-181320F");
TEST_RESULT_STR_KEYRPL( TEST_RESULT_STR(
testBackupValidate(storageRepo(), STRDEF(STORAGE_REPO_BACKUP "/20191027-181320F")), testBackupValidate(storageRepo(), STRDEF(STORAGE_REPO_BACKUP "/20191027-181320F")),
strNewFmt( strNewFmt(
"pg_data {path}\n" "pg_data {path}\n"
@ -2514,7 +2514,7 @@ testRun(void)
"P00 INFO: check archive for segment(s) 0000002C05DB8EB000000000:0000002C05DB8EB000000000\n" "P00 INFO: check archive for segment(s) 0000002C05DB8EB000000000:0000002C05DB8EB000000000\n"
"P00 INFO: new backup label = 20191027-181320F_20191030-014640I"); "P00 INFO: new backup label = 20191027-181320F_20191030-014640I");
TEST_RESULT_STR_Z_KEYRPL( TEST_RESULT_STR_Z(
testBackupValidate(storageRepo(), STRDEF(STORAGE_REPO_BACKUP "/latest")), testBackupValidate(storageRepo(), STRDEF(STORAGE_REPO_BACKUP "/latest")),
". {link, d=20191027-181320F_20191030-014640I}\n" ". {link, d=20191027-181320F_20191030-014640I}\n"
"pg_data {path}\n" "pg_data {path}\n"