The latter actually reports a number of matches on stdout, making the tests pass. --- tests.d/client-server/02-move-mail | 2 +- tests.d/client-server/03-copy-mail | 2 +- tests.d/client-server/04-replace-header | 2 +- tests.d/client-server/05-replace-header-fail | 2 +- tests.d/client-server/06-replace-header-already-ok | 2 +- tests.d/client-server/08-copy-mail-already-ok | 2 +- tests.d/client-server/10-delete-already-done | 2 +- tests.d/client-server/12-skip-add-already-there | 2 +- tests.d/client-server/14-skip-copy-already-there-copy-only | 2 +- tests.d/client-server/18-copybody | 2 +- tests.d/client-server/19-copybody-already-ok | 2 +- tests.d/client-server/22-replace | 2 +- tests.d/client-server/23-replace-aready-ok | 2 +- tests.d/client-server/34-move-fail2 | 2 +- tests.d/client-server/35-delete | 2 +- tests.d/client-server/36-move-fail3 | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/tests.d/client-server/02-move-mail b/tests.d/client-server/02-move-mail index e3dbd90..7828b69 100644 --- a/tests.d/client-server/02-move-mail +++ b/tests.d/client-server/02-move-mail @@ -9,7 +9,7 @@ msync 2 test_eq Mail target/Mail -X=`grep '^MOVE ' log.s2c | wc -l` +X=`grep -c '^MOVE ' log.s2c` assert $X 1 "missing MOVE in s2c" X=`grep '^COMMIT$' log.c2s | wc -l` diff --git a/tests.d/client-server/03-copy-mail b/tests.d/client-server/03-copy-mail index 0037531..ec185a2 100644 --- a/tests.d/client-server/03-copy-mail +++ b/tests.d/client-server/03-copy-mail @@ -9,7 +9,7 @@ msync 2 test_eq Mail target/Mail -X=`grep '^COPY ' log.s2c | wc -l` +X=`grep -c '^COPY ' log.s2c` assert $X 1 "missing COPY in s2c" X=`grep '^GET ' log.c2s | wc -l` diff --git a/tests.d/client-server/04-replace-header b/tests.d/client-server/04-replace-header index 8af6cbb..1ffcaf1 100644 --- a/tests.d/client-server/04-replace-header +++ b/tests.d/client-server/04-replace-header @@ -9,7 +9,7 @@ msync 2 test_eq Mail target/Mail -X=`grep '^REPLACEHEADER ' log.s2c | wc -l` +X=`grep -c '^REPLACEHEADER ' log.s2c` assert $X 1 "missing REPLACEHEADER in s2c" X=`grep '^GETHEADER ' log.c2s | wc -l` diff --git a/tests.d/client-server/05-replace-header-fail b/tests.d/client-server/05-replace-header-fail index 8743c24..9599251 100644 --- a/tests.d/client-server/05-replace-header-fail +++ b/tests.d/client-server/05-replace-header-fail @@ -11,7 +11,7 @@ msync 2 test_eq target/Mail.old target/Mail -X=`grep '^REPLACEHEADER ' log.s2c | wc -l` +X=`grep -c '^REPLACEHEADER ' log.s2c` assert $X 1 "missing REPLACEHEADER in s2c" X=`grep '^GETHEADER ' log.c2s | wc -l` diff --git a/tests.d/client-server/06-replace-header-already-ok b/tests.d/client-server/06-replace-header-already-ok index 1d29c14..c2c0b2f 100644 --- a/tests.d/client-server/06-replace-header-already-ok +++ b/tests.d/client-server/06-replace-header-already-ok @@ -10,7 +10,7 @@ test_eq Mail target/Mail msync 2 test_eq Mail target/Mail -X=`grep '^REPLACEHEADER ' log.s2c | wc -l` +X=`grep -c '^REPLACEHEADER ' log.s2c` assert $X 1 "missing REPLACEHEADER in s2c" X=`grep '^GETHEADER ' log.c2s | wc -l` diff --git a/tests.d/client-server/08-copy-mail-already-ok b/tests.d/client-server/08-copy-mail-already-ok index 781a109..0e481e5 100644 --- a/tests.d/client-server/08-copy-mail-already-ok +++ b/tests.d/client-server/08-copy-mail-already-ok @@ -10,7 +10,7 @@ msync 2 test_eq Mail target/Mail -X=`grep '^COPY ' log.s2c | wc -l` +X=`grep -c '^COPY ' log.s2c` assert $X 1 "missing COPY in s2c" X=`grep '^GET ' log.c2s | wc -l` diff --git a/tests.d/client-server/10-delete-already-done b/tests.d/client-server/10-delete-already-done index 926394d..c15603b 100644 --- a/tests.d/client-server/10-delete-already-done +++ b/tests.d/client-server/10-delete-already-done @@ -10,7 +10,7 @@ msync 2 test_eq Mail target/Mail -X=`grep '^DELETE ' log.s2c | wc -l` +X=`grep -c '^DELETE ' log.s2c` assert $X 1 "missing DELETE in s2c" X=`grep '^COMMIT$' log.c2s | wc -l` diff --git a/tests.d/client-server/12-skip-add-already-there b/tests.d/client-server/12-skip-add-already-there index 0a53a80..38ed3ff 100644 --- a/tests.d/client-server/12-skip-add-already-there +++ b/tests.d/client-server/12-skip-add-already-there @@ -10,7 +10,7 @@ msync 2 test_eq Mail target/Mail -X=`grep '^ADD ' log.s2c | wc -l` +X=`grep -c '^ADD ' log.s2c` assert $X 1 "missing ADD in s2c" X=`grep '^GET ' log.c2s | wc -l` diff --git a/tests.d/client-server/14-skip-copy-already-there-copy-only b/tests.d/client-server/14-skip-copy-already-there-copy-only index b5da177..08734a8 100644 --- a/tests.d/client-server/14-skip-copy-already-there-copy-only +++ b/tests.d/client-server/14-skip-copy-already-there-copy-only @@ -14,7 +14,7 @@ rm Mail/cur/$C test_eq Mail target/Mail -X=`grep '^COPY ' log.s2c | wc -l` +X=`grep -c '^COPY ' log.s2c` assert $X 1 "missing COPY in s2c" X=`grep '^GET ' log.c2s | wc -l` diff --git a/tests.d/client-server/18-copybody b/tests.d/client-server/18-copybody index 67cae47..127d734 100644 --- a/tests.d/client-server/18-copybody +++ b/tests.d/client-server/18-copybody @@ -10,7 +10,7 @@ msync 2 test_eq Mail target/Mail -X=`grep '^COPYBODY ' log.s2c | wc -l` +X=`grep -c '^COPYBODY ' log.s2c` assert $X 1 "missing COPY in s2c" X=`grep '^ADD ' log.s2c | wc -l` diff --git a/tests.d/client-server/19-copybody-already-ok b/tests.d/client-server/19-copybody-already-ok index f4e47d1..48079a0 100644 --- a/tests.d/client-server/19-copybody-already-ok +++ b/tests.d/client-server/19-copybody-already-ok @@ -11,7 +11,7 @@ msync 2 test_eq Mail target/Mail -X=`grep '^COPYBODY ' log.s2c | wc -l` +X=`grep -c '^COPYBODY ' log.s2c` assert $X 1 "missing COPY in s2c" X=`grep '^GETHEADER ' log.c2s | wc -l` diff --git a/tests.d/client-server/22-replace b/tests.d/client-server/22-replace index 44ef90d..4bc0bc8 100644 --- a/tests.d/client-server/22-replace +++ b/tests.d/client-server/22-replace @@ -10,7 +10,7 @@ msync 2 test_eq Mail target/Mail -X=`grep '^REPLACE ' log.s2c | wc -l` +X=`grep -c '^REPLACE ' log.s2c` assert $X 1 "missing REPLACE in s2c" X=`grep '^ADD ' log.s2c | wc -l` diff --git a/tests.d/client-server/23-replace-aready-ok b/tests.d/client-server/23-replace-aready-ok index 0be7357..55cb51c 100644 --- a/tests.d/client-server/23-replace-aready-ok +++ b/tests.d/client-server/23-replace-aready-ok @@ -12,7 +12,7 @@ msync 2 test_eq Mail target/Mail -X=`grep '^REPLACE ' log.s2c | wc -l` +X=`grep -c '^REPLACE ' log.s2c` assert $X 1 "missing REPLACE in s2c" X=`grep '^GET ' log.c2s | wc -l` diff --git a/tests.d/client-server/34-move-fail2 b/tests.d/client-server/34-move-fail2 index a58caac..4da3998 100644 --- a/tests.d/client-server/34-move-fail2 +++ b/tests.d/client-server/34-move-fail2 @@ -12,7 +12,7 @@ msync 2 test_eq target/Mail Mail -X=`grep '^MOVE ' log.s2c | wc -l` +X=`grep -c '^MOVE ' log.s2c` assert $X 1 "missing MOVE in s2c" X=`grep '^COMMIT$' log.c2s | wc -l` diff --git a/tests.d/client-server/35-delete b/tests.d/client-server/35-delete index 74d2026..76e142b 100644 --- a/tests.d/client-server/35-delete +++ b/tests.d/client-server/35-delete @@ -11,7 +11,7 @@ msync 2 test_eq target/Mail Mail -X=`grep '^DELETE ' log.s2c | wc -l` +X=`grep -c '^DELETE ' log.s2c` assert $X 1 "missing DELETE in s2c" X=`grep '^COMMIT$' log.c2s | wc -l` diff --git a/tests.d/client-server/36-move-fail3 b/tests.d/client-server/36-move-fail3 index 36b1105..961ecf5 100644 --- a/tests.d/client-server/36-move-fail3 +++ b/tests.d/client-server/36-move-fail3 @@ -11,7 +11,7 @@ sed -i 's/a/z/' target/$M msync 2 -X=`grep '^MOVE ' log.s2c | wc -l` +X=`grep -c '^MOVE ' log.s2c` assert $X 1 "missing MOVE in s2c" X=`grep '^COMMIT$' log.c2s | wc -l` -- 2.30.2
