[Box Backup-commit] COMMIT r3374 - in box/trunk/test: backupstorefix backupstorefix/testfiles bbackupd

subversion at boxbackup.org subversion at boxbackup.org
Sun Aug 17 11:59:17 BST 2014


Author: chris
Date: 2014-08-17 11:59:16 +0100 (Sun, 17 Aug 2014)
New Revision: 3374

Modified:
   box/trunk/test/backupstorefix/testbackupstorefix.cpp
   box/trunk/test/backupstorefix/testfiles/testbackupstorefix.pl.in
   box/trunk/test/bbackupd/testbbackupd.cpp
Log:
Fix tests broken by bbackupquery list recursive option change.

Modified: box/trunk/test/backupstorefix/testbackupstorefix.cpp
===================================================================
--- box/trunk/test/backupstorefix/testbackupstorefix.cpp	2014-08-15 22:48:16 UTC (rev 3373)
+++ box/trunk/test/backupstorefix/testbackupstorefix.cpp	2014-08-17 10:59:16 UTC (rev 3374)
@@ -614,7 +614,7 @@
 	
 	// Generate a list of all the object IDs
 	TEST_THAT_ABORTONFAIL(::system(BBACKUPQUERY " -Wwarning "
-		"-c testfiles/bbackupd.conf \"list -r\" quit "
+		"-c testfiles/bbackupd.conf \"list -R\" quit "
 		"> testfiles/initial-listing.txt") == 0);
 
 	// And load it in

Modified: box/trunk/test/backupstorefix/testfiles/testbackupstorefix.pl.in
===================================================================
--- box/trunk/test/backupstorefix/testfiles/testbackupstorefix.pl.in	2014-08-15 22:48:16 UTC (rev 3373)
+++ box/trunk/test/backupstorefix/testfiles/testbackupstorefix.pl.in	2014-08-17 10:59:16 UTC (rev 3374)
@@ -95,7 +95,7 @@
 	# read in the new listing, and compare
 	open LISTING,"../../bin/bbackupquery/bbackupquery -Wwarning " .
 		"-c testfiles/bbackupd.conf " .
-		"\"list -r\" quit |"
+		"\"list -R\" quit |"
 		or die "Can't open list utility";
 	open LISTING_COPY,'>testfiles/listing'.$ARGV[1].'.txt'
 		or die "can't open copy listing file";
@@ -131,7 +131,7 @@
 {
 	open LISTING,"../../bin/bbackupquery/bbackupquery -Wwarning " .
 		"-c testfiles/bbackupd.conf " .
-		"\"list -r\" quit |"
+		"\"list -R\" quit |"
 		or die "Can't open list utility";
 	open LISTING_COPY,'>testfiles/listing'.$ARGV[1].'.txt'
 		or die "can't open copy listing file";

Modified: box/trunk/test/bbackupd/testbbackupd.cpp
===================================================================
--- box/trunk/test/bbackupd/testbbackupd.cpp	2014-08-15 22:48:16 UTC (rev 3373)
+++ box/trunk/test/bbackupd/testbbackupd.cpp	2014-08-17 10:59:16 UTC (rev 3374)
@@ -3934,7 +3934,7 @@
 	/*
 	// List the files on the server - why?
 	::system(BBACKUPQUERY " -q -c testfiles/bbackupd.conf "
-		"-l testfiles/queryLIST.log \"list -rotdh\" quit");
+		"-l testfiles/queryLIST.log \"list -Rotdh\" quit");
 	TestRemoteProcessMemLeaks("bbackupquery.memleaks");
 	*/
 




More information about the Boxbackup-commit mailing list