From 4d8f9522a7cdada686dce1769d2f397b5c6488ee Mon Sep 17 00:00:00 2001 From: Sami Kerola Date: Thu, 9 Feb 2012 21:18:14 +0100 Subject: [PATCH] tests: fix dejagnu pwdx and vmstat checks The pwdx check expected error message, which where in use for only short period of time. The old message was put in place in commit 9d47cb0c38137581a46951fb7c6fa2a1dc8c24cf The vmstat issue was triggered by 'sr0' cdrom device, which gives following unexpected output. Fix simply ignores partitions which has zero activity. Besides such partitions probably would not apply as good candidate of -p option anyway. $ vmstat -p sr0 Partition was not found Reported-By: Moritz Muehlenhoff Bug-Debian: http://bugs.debian.org/656508 Signed-off-by: Sami Kerola --- testsuite/pwdx.test/pwdx.exp | 2 +- testsuite/vmstat.test/vmstat.exp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/testsuite/pwdx.test/pwdx.exp b/testsuite/pwdx.test/pwdx.exp index 0ca0b152..b86631f0 100644 --- a/testsuite/pwdx.test/pwdx.exp +++ b/testsuite/pwdx.test/pwdx.exp @@ -8,7 +8,7 @@ expect_pass "$test" "^\\s*Usage:\\s+\(lt-\)\?pwdx \\\[options\\\] pid\.\.\." # Run pwdx with pid 0 which is invalid set test "pwdx pid 0 should be invalid" spawn $pwdx 0 -expect_pass "$test" "^0: No such process" +expect_pass "$test" "\(lt-\)\?pwdx\: invalid process id\: 0" # Run pwdx with existing pid set test "pwdx finds sleep in cwd" diff --git a/testsuite/vmstat.test/vmstat.exp b/testsuite/vmstat.test/vmstat.exp index bd42bf8e..328e2fc5 100644 --- a/testsuite/vmstat.test/vmstat.exp +++ b/testsuite/vmstat.test/vmstat.exp @@ -31,7 +31,7 @@ expect_pass "$test" "^disk\[ -\]+reads\[ -\]+writes\[ -\]+IO\[ -\]+\\s+total\\s+ # Need a partition set diskstats [ exec cat /proc/diskstats ] -regexp "\\s+\\d+\\s+\\d+\\s+\(\[a-z\]+\\d+\)" $diskstats -> partition +regexp "\\s+\\d+\\s+\\d+\\s+\(\[a-z\]+\\d+\)\\s+\(\[0-9\]\[0-9\]+\)" $diskstats -> partition set test "vmstat partition (using $partition)" spawn $vmstat -p $partition expect_pass "$test" "^${partition}\\s+reads"