[src/trunk]: src/tests/lib/librumphijack fix the ssh rump test

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/fca22040b036
branches:  trunk
changeset: 985839:fca22040b036
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Sep 10 21:21:35 2021 +0000

description:
fix the ssh rump test

diffstat:

 tests/lib/librumphijack/t_tcpip.sh |  19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)

diffs (48 lines):

diff -r c710a109507d -r fca22040b036 tests/lib/librumphijack/t_tcpip.sh
--- a/tests/lib/librumphijack/t_tcpip.sh        Fri Sep 10 21:12:20 2021 +0000
+++ b/tests/lib/librumphijack/t_tcpip.sh        Fri Sep 10 21:21:35 2021 +0000
@@ -1,4 +1,4 @@
-#       $NetBSD: t_tcpip.sh,v 1.19 2019/05/13 17:55:08 bad Exp $
+#       $NetBSD: t_tcpip.sh,v 1.20 2021/09/10 21:21:35 christos Exp $
 #
 # Copyright (c) 2011 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -91,12 +91,14 @@
        atf_check -s eq:0 -o empty -e empty chmod 400 ssh_host_key
        atf_check -s eq:0 -o empty -e empty chmod 444 ssh_host_key.pub
 
+# Start in debugging mode so we don't have parent<->child privsep stuff
         env LD_PRELOAD=/usr/lib/librumphijack.so \
-           /usr/sbin/sshd -e -f ./sshd_config
-       while [ ! -f sshd.pid ]; do
-               sleep 0.01
-       done
-       echo "SSH server started (pid $(cat sshd.pid))"
+           /usr/sbin/sshd -d -e -E out -f ./sshd_config &
+#      while [ ! -f sshd.pid ]; do
+#              sleep 0.01
+#      done
+#      echo "SSH server started (pid $(cat sshd.pid))"
+       sleep 1
 
        echo "Setting up SSH client configuration"
        atf_check -s eq:0 -o empty -e empty \
@@ -122,8 +124,6 @@
 
 ssh_body()
 {
-       atf_expect_fail "PR lib/50174"
-
        atf_check -s exit:0 ${rumpnetsrv} ${RUMP_SERVER}
        # make sure clients die after we nuke the server
        export RUMPHIJACK_RETRYCONNECT='die'
@@ -137,7 +137,8 @@
        jot 11 12 | xargs mkdir
        cd ..
 
-       atf_check -s exit:0 -o save:ssh.out                             \
+       # ignore stderr for now, prints environment in debug mode
+       atf_check -s exit:0 -o save:ssh.out -e ignore                   \
            env LD_PRELOAD=/usr/lib/librumphijack.so                    \
            ssh -T -F ssh_config 127.0.0.1 env BLOCKSIZE=512            \
            ls -li $(pwd)/testdir