Changeset 2056 for box/trunk/test

Timestamp:

23/01/2008 20:14:37 (4 years ago)

Author:

chris

Message:

Ignore terminal type error messages from bbackupquery, may happen
in Debian buildds.

Location:

box/trunk/test/bbackupd/testfiles

Files:

• extcheck1.pl.in (modified) (3 diffs)
• extcheck2.pl.in (modified) (3 diffs)

box/trunk/test/bbackupd/testfiles/extcheck1.pl.in

@@ -16 +16 @@
 {
         next unless m/\S/;
-        if(m/continousupdate/)
+        print "READ: $_";
+
+        if (m/continousupdate/)
         {
                 unless (/exists/)
@@ -24 +26 @@
                 }
                 $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
@@ -34 +42 @@
                 }
         }
-        print "READ: $_";
 }
 

box/trunk/test/bbackupd/testfiles/extcheck2.pl.in

@@ -15 +15 @@
 {
         next unless m/\S/;
-        if(m/continousupdate/)
+        print "READ: $_";
+
+        if (m/continousupdate/)
         {
                 unless (m/contents/ or m/attributes/)
@@ -22 +24 @@
                         $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
@@ -32 +40 @@
                 }
         }
-
-        print "READ: $_";
 }