[Box Backup-commit] COMMIT r2056 - box/trunk/test/bbackupd/testfiles

[boxbackup-dev@fluffy.co.uk]

Author: chris
Date: 2008-01-23 20:14:37 +0000 (Wed, 23 Jan 2008)
New Revision: 2056

Modified:
   box/trunk/test/bbackupd/testfiles/extcheck1.pl.in
   box/trunk/test/bbackupd/testfiles/extcheck2.pl.in
Log:
Ignore terminal type error messages from bbackupquery, may happen
in Debian buildds.


Modified: box/trunk/test/bbackupd/testfiles/extcheck1.pl.in
===================================================================
--- box/trunk/test/bbackupd/testfiles/extcheck1.pl.in	2008-01-23 20:01:40 UTC (rev 2055)
+++ box/trunk/test/bbackupd/testfiles/extcheck1.pl.in	2008-01-23 20:14:37 UTC (rev 2056)
@@ -15,7 +15,9 @@
 while(<IN>)
 {
 	next unless m/\S/;
-	if(m/continousupdate/)
+	print "READ: $_";
+
+	if (m/continousupdate/)
 	{
 		unless (/exists/)
 		{
@@ -24,6 +26,12 @@
 		}
 		$seen = 1;
 	}
+	elsif (m/^No entry for terminal type/ or
+		m/^using dumb terminal settings/)
+	{
+		# skip these lines, may happen in Debian buildd
+		# with no terminal.
+	}
 	else
 	{
 		unless (/\AWARNING/ or /\ADifferences/ or /might be reason/
@@ -33,7 +41,6 @@
 			$ret = 2;
 		}
 	}
-	print "READ: $_";
 }
 
 close IN;

Modified: box/trunk/test/bbackupd/testfiles/extcheck2.pl.in
===================================================================
--- box/trunk/test/bbackupd/testfiles/extcheck2.pl.in	2008-01-23 20:01:40 UTC (rev 2055)
+++ box/trunk/test/bbackupd/testfiles/extcheck2.pl.in	2008-01-23 20:14:37 UTC (rev 2056)
@@ -14,7 +14,9 @@
 while(<IN>)
 {
 	next unless m/\S/;
-	if(m/continousupdate/)
+	print "READ: $_";
+
+	if (m/continousupdate/)
 	{
 		unless (m/contents/ or m/attributes/)
 		{
@@ -22,6 +24,12 @@
 			$ret = 2;
 		}
 	}
+	elsif (m/^No entry for terminal type/ or
+		m/^using dumb terminal settings/)
+	{
+		# skip these lines, may happen in Debian buildd
+		# with no terminal.
+	}
 	else
 	{
 		unless (/\AWARNING/ or /\ADifferences/ or /might be reason/ 
@@ -31,8 +39,6 @@
 			$ret = 2;
 		}
 	}
-
-	print "READ: $_";
 }
 
 close IN;