summaryrefslogtreecommitdiff
path: root/test/backupstorefix
diff options
context:
space:
mode:
Diffstat (limited to 'test/backupstorefix')
-rw-r--r--test/backupstorefix/testbackupstorefix.cpp5
-rwxr-xr-xtest/backupstorefix/testfiles/testbackupstorefix.pl.in2
2 files changed, 3 insertions, 4 deletions
diff --git a/test/backupstorefix/testbackupstorefix.cpp b/test/backupstorefix/testbackupstorefix.cpp
index 6099f133..79fd68e1 100644
--- a/test/backupstorefix/testbackupstorefix.cpp
+++ b/test/backupstorefix/testbackupstorefix.cpp
@@ -671,8 +671,7 @@ int test(int argc, const char *argv[])
char name[256];
while(::fgets(line, sizeof(line), f) != 0)
{
- if(StartsWith("WARNING: This version of Box Backup overrides the "
- "system-wide SSLSecurityLevel", line))
+ if(StartsWith("WARNING: SSLSecurityLevel not set.", line))
{
continue;
}
@@ -1014,7 +1013,7 @@ int test(int argc, const char *argv[])
TEST_THAT(KillServer(bbstored_pid));
#ifdef WIN32
- TEST_THAT(unlink("testfiles/bbstored.pid") == 0);
+ TEST_THAT(EMU_UNLINK("testfiles/bbstored.pid") == 0);
#else
TestRemoteProcessMemLeaks("bbstored.memleaks");
#endif
diff --git a/test/backupstorefix/testfiles/testbackupstorefix.pl.in b/test/backupstorefix/testfiles/testbackupstorefix.pl.in
index 177b3b70..483087f7 100755
--- a/test/backupstorefix/testfiles/testbackupstorefix.pl.in
+++ b/test/backupstorefix/testfiles/testbackupstorefix.pl.in
@@ -154,7 +154,7 @@ elsif($ARGV[0] eq 'reroot')
chomp $line;
$line =~s/\[FILENAME NOT ENCRYPTED\]//;
next if $line =~ /^WARNING: \*\*\*\* BackupStoreFilename encoded with Clear encoding \*\*\*\*/;
- next if $line =~ /^WARNING: This version of Box Backup overrides the system-wide SSLSecurityLevel/;
+ next if $line =~ /^WARNING: SSLSecurityLevel not set./;
my ($id,$type,$name) = split / /, $line;
$count++;
if($name !~ /\Alost\+found0/)