From a2e6ac25f8759d1ce440c08ed8519217c74e349e Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Sat, 28 Apr 2007 22:51:12 +0000 Subject: Use helper function rather than calling bbackupctl directly. (refs #3) --- test/bbackupd/testbbackupd.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'test/bbackupd') diff --git a/test/bbackupd/testbbackupd.cpp b/test/bbackupd/testbbackupd.cpp index 3fec1fa1..41f7452c 100644 --- a/test/bbackupd/testbbackupd.cpp +++ b/test/bbackupd/testbbackupd.cpp @@ -2113,9 +2113,10 @@ int test_bbackupd() printf("\n==== Continuously update file, " "check isn't uploaded\n"); - // Make sure everything happens at the same point in the sync cycle: wait until exactly the start of a sync - TEST_THAT(::system("../../bin/bbackupctl/bbackupctl -c testfiles/bbackupd.conf wait-for-sync") == 0); - TestRemoteProcessMemLeaks("bbackupctl.memleaks"); + // Make sure everything happens at the same point in the + // sync cycle: wait until exactly the start of a sync + wait_for_sync_start(); + // Then wait a second, to make sure the scan is complete ::safe_sleep(1); @@ -2398,10 +2399,11 @@ int test_bbackupd() printf("\n==== Create a file with timestamp way ahead " "in the future\n"); // Time critical, so sync - TEST_THAT(::system("../../bin/bbackupctl/bbackupctl -q -c testfiles/bbackupd.conf wait-for-sync") == 0); - TestRemoteProcessMemLeaks("bbackupctl.memleaks"); + wait_for_sync_start(); + // Then wait a second, to make sure the scan is complete ::safe_sleep(1); + // Then modify an existing file { FILE *f = fopen("testfiles/TestDir1/sub23/in-the-future", "w"); -- cgit v1.2.3