(Top level): Improve the test code.

ChangeLog

 2003-10-06  Per Cederqvist  <ceder@ceder.dyndns.org>
 
+	Improve the test code.
+	* pcl_expect.py (Top level): Improve the test code.
+
 	Who can refuse the Inspiration?  The impl, expectable and popen
 	classes seems to work now.
 	* pcl_expect.py (expectable.__init__): New argument: fileno.

pcl_expect.py

@@ -255,19 +255,22 @@ if __name__ == '__main__':
 
     x = impl()
     while x.loop():
-        if x.re(df, "^/.* .*\n"):
+        if x.re(df, "^/.* .*(?=\n)"):
             print "Normal line:", df.match.group()
             x.cont()
             continue
-        elif x.re(df, "^/.*\n"):
+        elif x.re(df, "^/.*(?=\n)"):
             print "Mount point only:", df.match.group()
             x.cont()
             continue
-        elif x.re(df, "^ .*\n"):
+        elif x.re(df, "^ .*(?=\n)"):
             print "Info only:", df.match.group()
             x.cont()
             continue
-        elif x.re(df, "^.*\n"):
+        elif x.re(df, "^\n"):
+            x.cont()
+            continue
+        elif x.re(df, "^.*(?=\n)"):
             print "Unexpected line", df.match.group()
             x.cont()
             continue