Remove all timing dependency from test_ssl_keepalives().

This test has always been fragile, and usually fails on Travis for reasons
unknown, so replace the log parsing and intercepts with simple mocking code.
This doesn't cover 100% of what the old test did, including diff timer aborts
and the number of blocks used by the uploaded files, but it should be
completely robust.

1 files changed, 6 insertions, 2 deletions

diff --git a/test/backupstorepatch/testbackupstorepatch.cpp b/test/backupstorepatch/testbackupstorepatch.cpp
index 100afa40..e149a041 100644
--- a/test/backupstorepatch/testbackupstorepatch.cpp
+++ b/test/backupstorepatch/testbackupstorepatch.cpp
@@ -504,9 +504,13 @@ int test(int argc, const char *argv[])
 							storeRootDir, discSet,
 							filenameOut,
 							false /* don't bother ensuring the directory exists */);
-						TEST_EQUAL(RaidFileUtil::NoFile,
+						std::ostringstream msg;
+						msg << "Unreferenced object " <<
+							test_files[f].IDOnServer <<
+							" was not deleted by housekeeping";
+						TEST_EQUAL_LINE(RaidFileUtil::NoFile,
 							RaidFileUtil::RaidFileExists(
-								rfd, filenameOut));
+								rfd, filenameOut), msg.str());
 					}
 					else
 					{