From 4a6ca54b47b3a56a96b2c92c6e7267fe24997ce9 Mon Sep 17 00:00:00 2001
From: David Steele <david@pgmasters.net>
Date: Thu, 15 Jul 2021 13:19:49 -0400
Subject: [PATCH] Remove last vestiges of key replacement missed in b270253a.

---
 test/src/common/harnessTest.h        |  4 ----
 test/src/module/command/backupTest.c | 12 ++++++------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/test/src/common/harnessTest.h b/test/src/common/harnessTest.h
index 244b4ef89..d06da5172 100644
--- a/test/src/common/harnessTest.h
+++ b/test/src/common/harnessTest.h
@@ -205,10 +205,6 @@ Macros to compare results of common data types
     TEST_RESULT_Z(strZNull(statement), strZNull(resultExpected), comment)
 #define TEST_RESULT_STR_Z(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)                                                                      \
     TEST_RESULT_Z(statement, strZNull(resultExpected), comment)
 
diff --git a/test/src/module/command/backupTest.c b/test/src/module/command/backupTest.c
index 92d159b5c..beb31257b 100644
--- a/test/src/module/command/backupTest.c
+++ b/test/src/module/command/backupTest.c
@@ -1690,7 +1690,7 @@ testRun(void)
                 "P00   INFO: backup stop archive = 0000000105D944C000000000, lsn = 5d944c0/800000\n"
                 "P00   INFO: new backup label = 20191002-070640F");
 
-            TEST_RESULT_STR_Z_KEYRPL(
+            TEST_RESULT_STR_Z(
                 testBackupValidate(storageRepo(), STRDEF(STORAGE_REPO_BACKUP "/latest")),
                 ". {link, d=20191002-070640F}\n"
                 "pg_data {path}\n"
@@ -1864,7 +1864,7 @@ testRun(void)
                 "P00 DETAIL: copy segment 0000000105D95D3000000000 to backup\n"
                 "P00   INFO: new backup label = 20191003-105320F");
 
-            TEST_RESULT_STR_Z_KEYRPL(
+            TEST_RESULT_STR_Z(
                 testBackupValidate(storageRepo(), STRDEF(STORAGE_REPO_BACKUP "/latest")),
                 ". {link, d=20191003-105320F}\n"
                 "pg_data {path}\n"
@@ -2030,7 +2030,7 @@ testRun(void)
                 "P00   INFO: new backup label = 20191003-105320F_20191004-144000D");
 
             // Check repo directory
-            TEST_RESULT_STR_Z_KEYRPL(
+            TEST_RESULT_STR_Z(
                 testBackupValidate(storageRepo(), STRDEF(STORAGE_REPO_BACKUP "/latest")),
                 ". {link, d=20191003-105320F_20191004-144000D}\n"
                 "pg_data {path}\n"
@@ -2160,7 +2160,7 @@ testRun(void)
             TEST_RESULT_LOG(
                 "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")),
                 ". {link, d=20191016-042640F}\n"
                 "pg_data {path}\n"
@@ -2354,7 +2354,7 @@ testRun(void)
                 "P00 DETAIL: copy segment 0000000105DB5DE000000002 to backup\n"
                 "P00   INFO: new backup label = 20191027-181320F");
 
-            TEST_RESULT_STR_KEYRPL(
+            TEST_RESULT_STR(
                 testBackupValidate(storageRepo(), STRDEF(STORAGE_REPO_BACKUP "/20191027-181320F")),
                 strNewFmt(
                     "pg_data {path}\n"
@@ -2514,7 +2514,7 @@ testRun(void)
                 "P00   INFO: check archive for segment(s) 0000002C05DB8EB000000000:0000002C05DB8EB000000000\n"
                 "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")),
                 ". {link, d=20191027-181320F_20191030-014640I}\n"
                 "pg_data {path}\n"