[Box Backup-dev] COMMIT r671 - box/chris/general/test/bbackupd
boxbackup-dev at fluffy.co.uk
boxbackup-dev at fluffy.co.uk
Sun Jul 23 00:24:06 BST 2006
Author: chris
Date: 2006-07-22 23:23:59 +0000 (Sat, 22 Jul 2006)
New Revision: 671
Modified:
box/chris/general/test/bbackupd/testbbackupd.cpp
Log:
* testbbackupd.cpp
- Moved terminate_bbackupd() to lib/common/Test.h
Modified: box/chris/general/test/bbackupd/testbbackupd.cpp
===================================================================
--- box/chris/general/test/bbackupd/testbbackupd.cpp 2006-07-22 23:23:08 UTC (rev 670)
+++ box/chris/general/test/bbackupd/testbbackupd.cpp 2006-07-22 23:23:59 UTC (rev 671)
@@ -58,16 +58,6 @@
// two cycles and a bit
#define TIME_TO_WAIT_FOR_BACKUP_OPERATION 12
-#ifdef WIN32
-#define BBACKUPQUERY "..\\..\\bin\\bbackupquery\\bbackupquery.exe"
-#define BBACKUPCTL "..\\..\\bin\\bbackupctl\\bbackupctl"
-#define TEST_RETURN(actual, expected) TEST_THAT(actual == expected);
-#else
-#define BBACKUPQUERY "../../bin/bbackupquery/bbackupquery"
-#define BBACKUPCTL "../../bin/bbackupctl/bbackupctl"
-#define TEST_RETURN(actual, expected) TEST_THAT(actual == expected*256);
-#endif
-
void wait_for_backup_operation(int seconds = TIME_TO_WAIT_FOR_BACKUP_OPERATION)
{
printf("waiting: ");
@@ -570,24 +560,6 @@
TestRemoteProcessMemLeaks("bbackupctl.memleaks");
}
-void terminate_bbackupd(int pid)
-{
- TEST_THAT(::system(BBACKUPCTL " -q -c testfiles/bbackupd.conf "
- "terminate") == 0);
- TestRemoteProcessMemLeaks("bbackupctl.memleaks");
-
- for (int i = 0; i < 20; i++)
- {
- if (!ServerIsAlive(pid)) break;
- fprintf(stdout, ".");
- fflush(stdout);
- sleep(1);
- }
-
- TEST_THAT(!ServerIsAlive(pid));
- TestRemoteProcessMemLeaks("bbackupd.memleaks");
-}
-
int test_bbackupd()
{
// // First, wait for a normal period to make sure the last changes attributes are within a normal backup timeframe.
More information about the Boxbackup-dev
mailing list