Modified regular expression to support different styles of uptime results.

git-svn-id: http://pexpect.svn.sourceforge.net/svnroot/pexpect/trunk@92 656d521f-e311-0410-88e0-e7920216d269

1 files changed, 10 insertions, 1 deletions

diff --git a/pexpect/examples/uptime.py b/pexpect/examples/uptime.py
index c54a4b5..d8d8049 100644
--- a/pexpect/examples/uptime.py
+++ b/pexpect/examples/uptime.py
@@ -7,8 +7,17 @@ regular expression that uses subgroups.
 import pexpect
 import re
 
+# Different styles of uptime results.
+#
+# [x86] Linux 2.4 (Redhat 7.3)
+#  2:06pm  up 63 days, 18 min,  3 users,  load average: 0.32, 0.08, 0.02
+# [PPC - G4] MacOS X 10.1 SERVER Edition
+# 2:11PM  up 3 days, 13:50, 3 users, load averages: 0.01, 0.00, 0.00
+# [Sparc - R220] Sun Solaris (8)
+#  2:13pm  up 22 min(s),  1 user,  load average: 0.02, 0.01, 0.01
+
 p = pexpect.spawn ('uptime')
-p.expect ('up ([0-9]+) days, ..:..,\s+([0-9]+) users,\s+load average[s]*: ([0-9]+\.[0-9][0-9]), ([0-9]+\.[0-9][0-9]), ([0-9]+\.[0-9][0-9])')
+p.expect ('up ([0-9]+) days,.*?,\s+([0-9]+) users,\s+load average[s]*: ([0-9]+\.[0-9][0-9]), ([0-9]+\.[0-9][0-9]), ([0-9]+\.[0-9][0-9])')
 
 days, users, av1, av5, av15 = p.match.groups()