From 48a74eea95b1bd7e69151d4f4122868a777a18a6 Mon Sep 17 00:00:00 2001
From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Sat, 14 Mar 2020 16:50:28 +0000
Subject: [PATCH] Testtsuite: portability
---
test/confs/0999 | 16 ++++++++--------
test/scripts/0999-EXP-Queue-Ramp/0999 | 3 ++-
test/stderr/0999 | 3 ++-
3 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/test/confs/0999 b/test/confs/0999
index c3a2ad4d2..80d261f5f 100644
--- a/test/confs/0999
+++ b/test/confs/0999
@@ -22,14 +22,14 @@ queue_fast_ramp
begin routers
-client:
- driver = accept
- condition = ${if eq {SERVER}{server}{no}{yes}}
- transport = send_to_server
-
-server:
- driver = accept
- transport = send_to_server
+drain_q:
+ driver = accept
+ condition = ${if !def:sender_host_address}
+ transport = send_to_server
+
+targetsys:
+ driver = redirect
+ data = :blackhole:
# ----- Transports -----
diff --git a/test/scripts/0999-EXP-Queue-Ramp/0999 b/test/scripts/0999-EXP-Queue-Ramp/0999
index dc60dfa6a..688c24cf8 100644
--- a/test/scripts/0999-EXP-Queue-Ramp/0999
+++ b/test/scripts/0999-EXP-Queue-Ramp/0999
@@ -676,8 +676,9 @@ killdaemon
# about ordering or mistakes in wrong message-id
sudo perl
system "egrep -v '(Completed|<=|=>|is locked)' DIR/spool/log/mainlog 1>&2";
-system "wc -l DIR/test-stdout 1>&2";
+system "awk '/OK id=/{i++} END{print i, \"messages in\"}' DIR/test-stdout 1>&2";
system "grep -q '=>' DIR/spool/log/servermainlog && echo 'daemon did make at least one delivery' 1>&2";
+system "awk '/<=/{i++} END{print i, \"messages received by dest\"}' DIR/spool/log/servermainlog 1>&2";
****
sudo rm DIR/spool/log/mainlog DIR/spool/log/servermainlog
no_stdout_check
diff --git a/test/stderr/0999 b/test/stderr/0999
index 1b45b63fb..2e7d5393c 100644
--- a/test/stderr/0999
+++ b/test/stderr/0999
@@ -1,6 +1,7 @@
2017-07-30 18:51:05.712 Start queue run: pid=pppp -qq
2017-07-30 18:51:05.712 End queue run: pid=pppp -qq
-406 TESTSUITE/test-stdout
+81 messages in
daemon did make at least one delivery
+81 messages received by dest
******** SERVER ********
--
2.25.1