diff options
| author | Chris Wilson <chris+github@qwirx.com> | 2008-05-28 15:35:42 +0000 |
|---|---|---|
| committer | Chris Wilson <chris+github@qwirx.com> | 2008-05-28 15:35:42 +0000 |
| commit | 4b9ea5a1e413ac0180007c4c59d8809621325d5b (patch) | |
| tree | 775e846fab81dcf7fcfacc7a8ab09df0c43ae4ab /test/backupstorefix | |
| parent | 4083d782afd068b60a8b2dacab3ed8a055d77bf7 (diff) | |
Add bbackupquery -W<level> option to set explicit warning level,
Obsolete old (inconsistent) meaning of -q in bbackupquery.
Replace -q with -Wwarning or -Werror in tests to reduce noise and fix
tests.
Test that reading a nonexistent directory on the server doesn't crash
server or client.
Test that bbackupd does continue backup run and delete files when
storage limit is exceeded.
Use logging guards to hide expected warnings in testbbackupd.
Remove apparently pointless listing files on server at the end of
testbbackupd.
Diffstat (limited to 'test/backupstorefix')
| -rw-r--r-- | test/backupstorefix/testbackupstorefix.cpp | 2 | ||||
| -rwxr-xr-x | test/backupstorefix/testfiles/testbackupstorefix.pl.in | 16 |
2 files changed, 13 insertions, 5 deletions
diff --git a/test/backupstorefix/testbackupstorefix.cpp b/test/backupstorefix/testbackupstorefix.cpp index 3954d7ad..7d696575 100644 --- a/test/backupstorefix/testbackupstorefix.cpp +++ b/test/backupstorefix/testbackupstorefix.cpp @@ -338,7 +338,7 @@ int test(int argc, const char *argv[]) } // Generate a list of all the object IDs - TEST_THAT_ABORTONFAIL(::system(BBACKUPQUERY " -q " + TEST_THAT_ABORTONFAIL(::system(BBACKUPQUERY " -Wwarning " "-c testfiles/bbackupd.conf \"list -r\" quit " "> testfiles/initial-listing.txt") == 0); diff --git a/test/backupstorefix/testfiles/testbackupstorefix.pl.in b/test/backupstorefix/testfiles/testbackupstorefix.pl.in index e64474f0..d27c1106 100755 --- a/test/backupstorefix/testfiles/testbackupstorefix.pl.in +++ b/test/backupstorefix/testfiles/testbackupstorefix.pl.in @@ -93,8 +93,12 @@ elsif($ARGV[0] eq 'check') } # read in the new listing, and compare - open LISTING,"../../bin/bbackupquery/bbackupquery -q -c testfiles/bbackupd.conf \"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"; + open LISTING,"../../bin/bbackupquery/bbackupquery -Wwarning " . + "-c testfiles/bbackupd.conf " . + "\"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"; my $err = 0; while(<LISTING>) { @@ -125,8 +129,12 @@ elsif($ARGV[0] eq 'check') } elsif($ARGV[0] eq 'reroot') { - open LISTING,"../../bin/bbackupquery/bbackupquery -q -c testfiles/bbackupd.conf \"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"; + open LISTING,"../../bin/bbackupquery/bbackupquery -Wwarning " . + "-c testfiles/bbackupd.conf " . + "\"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"; my $err = 0; my $count = 0; while(<LISTING>) |