From 3b5d5078fc82efa6405d5686610834e4a6a1bbc5 Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Fri, 24 Apr 2015 17:29:15 +0200 Subject: [PATCH] Testsuite: Fix check_dir_size() fs dependencies --- test/runtest | 4 ++-- test/stderr/5005 | 8 ++++---- test/stderr/5006 | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/test/runtest b/test/runtest index 84467064e..9d78ce976 100755 --- a/test/runtest +++ b/test/runtest @@ -732,8 +732,8 @@ RESET_AFTER_EXTRA_LINE_READ: s/this message = \d+\b/this message = sss/; s/Size of headers = \d+/Size of headers = sss/; s/sum=(?!0)\d+/sum=dddd/; - s/(?<=sum=dddd )count=(?!0)\d+\b/count=dd/; - s/(?<=sum=0 )count=(?!0)\d+\b/count=dd/; + s/(?<=sum=dddd )count=\d+\b/count=dd/; + s/(?<=sum=0 )count=\d+\b/count=dd/; s/,S is \d+\b/,S is ddddd/; s/\+0100,\d+;/+0100,ddd;/; s/\(\d+ bytes written\)/(ddd bytes written)/; diff --git a/test/stderr/5005 b/test/stderr/5005 index ae0dbba0b..f55aa9b1f 100644 --- a/test/stderr/5005 +++ b/test/stderr/5005 @@ -129,8 +129,8 @@ using regex for maildir directory selection: ^(?:cur|new|\..*)$ looking for maildirsize in TESTSUITE/test-mail/nofile TESTSUITE/test-mail/nofile/maildirsize does not exist: recalculating MUNGED: the check_dir_size lines have been sorted to ensure consistency -check_dir_size: dir=TESTSUITE/test-mail/nofile/cur sum=0 count=0 -check_dir_size: dir=TESTSUITE/test-mail/nofile/new sum=0 count=0 +check_dir_size: dir=TESTSUITE/test-mail/nofile/cur sum=0 count=dd +check_dir_size: dir=TESTSUITE/test-mail/nofile/new sum=0 count=dd skipping TESTSUITE/test-mail/nofile/tmp: dir_regex does not match maildir_compute_size: path=TESTSUITE/test-mail/nofile sum=0 filecount=0 timestamp=ddddddd @@ -312,8 +312,8 @@ reading quota parameters from maildirsize data cached quota is out of date: recalculating quota=500 cached_quota=50 filecount_quota=0 cached_quota_filecount=2 MUNGED: the check_dir_size lines have been sorted to ensure consistency -check_dir_size: dir=TESTSUITE/test-mail/userx/cur sum=0 count=0 -check_dir_size: dir=TESTSUITE/test-mail/userx/new sum=0 count=0 +check_dir_size: dir=TESTSUITE/test-mail/userx/cur sum=0 count=dd +check_dir_size: dir=TESTSUITE/test-mail/userx/new sum=0 count=dd skipping TESTSUITE/test-mail/userx/maildirsize: dir_regex does not match skipping TESTSUITE/test-mail/userx/tmp: dir_regex does not match maildir_compute_size: path=TESTSUITE/test-mail/userx diff --git a/test/stderr/5006 b/test/stderr/5006 index 9df6ced95..15e322819 100644 --- a/test/stderr/5006 +++ b/test/stderr/5006 @@ -129,8 +129,8 @@ using regex for maildir directory selection: ^(?:cur|new|\..*)$ looking for maildirsize in TESTSUITE/test-mail/userx TESTSUITE/test-mail/userx/maildirsize does not exist: recalculating MUNGED: the check_dir_size lines have been sorted to ensure consistency -check_dir_size: dir=TESTSUITE/test-mail/userx/cur sum=0 count=0 -check_dir_size: dir=TESTSUITE/test-mail/userx/new sum=0 count=0 +check_dir_size: dir=TESTSUITE/test-mail/userx/cur sum=0 count=dd +check_dir_size: dir=TESTSUITE/test-mail/userx/new sum=0 count=dd skipping TESTSUITE/test-mail/userx/tmp: dir_regex does not match maildir_compute_size: path=TESTSUITE/test-mail/userx sum=0 filecount=0 timestamp=ddddddd -- 2.30.2