From 7218586f2ffde3473741ea144c09887e351d556b Mon Sep 17 00:00:00 2001
From: Jon Fu <jon.fu@snowflake.com>
Date: Tue, 6 Oct 2020 17:03:09 -0400
Subject: [PATCH] adjust test spec and backup describe

---
 fdbclient/FileBackupAgent.actor.cpp                   |  3 ++-
 .../from_7.0.0/SnapIncrementalRestore-1.toml          | 11 +----------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/fdbclient/FileBackupAgent.actor.cpp b/fdbclient/FileBackupAgent.actor.cpp
index d2721d9c0e..07cfe642ec 100644
--- a/fdbclient/FileBackupAgent.actor.cpp
+++ b/fdbclient/FileBackupAgent.actor.cpp
@@ -4506,7 +4506,7 @@ public:
 	                                     Version beginVersion, UID randomUid) {
 		state Reference<IBackupContainer> bc = IBackupContainer::openContainer(url.toString());
 
-		state BackupDescription desc = wait(bc->describeBackup(true, beginVersion));
+		state BackupDescription desc = wait(bc->describeBackup(true));
 		if(cxOrig.present()) {
 			wait(desc.resolveVersionTimes(cxOrig.get()));
 		}
@@ -4525,6 +4525,7 @@ public:
 		if(!restoreSet.present()) {
 			TraceEvent(SevWarn, "FileBackupAgentRestoreNotPossible")
 				.detail("BackupContainer", bc->getURL())
+				.detail("BeginVersion", beginVersion)
 				.detail("TargetVersion", targetVersion);
 			fprintf(stderr, "ERROR: Restore version %" PRId64 " is not possible from %s\n", targetVersion, bc->getURL().c_str());
 			throw restore_invalid_version();
diff --git a/tests/restarting/from_7.0.0/SnapIncrementalRestore-1.toml b/tests/restarting/from_7.0.0/SnapIncrementalRestore-1.toml
index 648668121e..2968e831c5 100644
--- a/tests/restarting/from_7.0.0/SnapIncrementalRestore-1.toml
+++ b/tests/restarting/from_7.0.0/SnapIncrementalRestore-1.toml
@@ -32,7 +32,7 @@ clearAfterTest = false
 [[test]]
 testTitle = 'PostSnapWorkloads'
 simBackupAgents = 'BackupToFile'
-clearAfterTest = false
+clearAfterTest = true
 
     [[test.workload]]
     testName = 'Cycle'
@@ -45,15 +45,6 @@ clearAfterTest = false
     testName = 'IncrementalBackup'
     tag = 'default'
     waitForBackup = true
-
-[[test]]
-testTitle = 'StopBackupAndClear'
-simBackupAgents = 'BackupToFile'
-clearAfterTest = true
-
-    [[test.workload]]
-    testName = 'IncrementalBackup'
-    tag = 'default'
     stopBackup = true
 
 [[test]]