From 4dbf61478ae6e7de164ca6abeccb92ee541f33dc Mon Sep 17 00:00:00 2001
From: Jim Garlick <garlick.jim@gmail.com>
Date: Sun, 26 Nov 2023 05:29:38 -0800
Subject: [PATCH] testsuite: cover remote PATH in ssh connector

Problem: there is no test coverage showing that the ssh
connector sets the remote path.

Add some tests to t1106-ssh-conenctor.t.
---
 t/t1106-ssh-connector.t | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/t/t1106-ssh-connector.t b/t/t1106-ssh-connector.t
index 82e961c2251e..b8ebe053cda4 100755
--- a/t/t1106-ssh-connector.t
+++ b/t/t1106-ssh-connector.t
@@ -12,6 +12,22 @@ export TEST_SOCKDIR=$(echo $FLUX_URI | sed -e "s!local://!!") &&
 export TEST_SSH=${SHARNESS_TEST_SRCDIR}/scripts/tssh
 RPC=${FLUX_BUILD_DIR}/t/request/rpc
 
+extract_env_command() {
+	grep cmd= \
+	    | sed s/cmd=\"env\ // \
+	    | sed s/\ flux\ relay.*// \
+	    | xargs -n1
+}
+
+test_expect_success 'rundir/bin directory exists' '
+	test -d $(dirname $TEST_SOCKDIR)/bin
+'
+test_expect_success 'rundir/bin/flux symlink exists' '
+	test -h $(dirname $TEST_SOCKDIR)/bin/flux
+'
+test_expect_success 'rundir/bin/flux points to an executable' '
+	test -x $(dirname $TEST_SOCKDIR)/bin/flux
+'
 test_expect_success 'load heartbeat module with fast rate' '
         flux module load heartbeat period=0.1s
 '
@@ -21,6 +37,31 @@ test_expect_success 'ssh:// with local sockdir works' '
 	  grep hostname=localhost basic.err &&
 	  grep cmd= basic.err | grep "flux relay $TEST_SOCKDIR"
 '
+test_expect_success 'remote PATH is set' '
+	extract_env_command <basic.err >basic.env &&
+	grep -q "^PATH=" basic.env
+'
+test_expect_success 'remote PATH has rundir/bin first' '
+	grep -q "^PATH=$(dirname $TEST_SOCKDIR)/bin:" basic.env
+'
+test_expect_success 'remote PATH includes local flux bindir' '
+	fbindir=$(dirname $(which flux)) &&
+	grep -q "^PATH=.*:$fbindir" basic.env
+'
+test_expect_success 'remote PATH includes system bindirs' '
+	grep -q "^PATH=.*:/bin:/usr/bin" basic.env
+'
+# N.B. ensure LD_LIBRARY_PATH is set so env(1) is used when PATH is not set
+# For in tree testing it is set by libtool wrappers
+test_expect_success 'ssh:// with FLUX_SSH_RCMD does not set remote PATH' '
+	env FLUX_URI=ssh://localhost$TEST_SOCKDIR \
+	    FLUX_SSH=$TEST_SSH \
+	    FLUX_SSH_RCMD=flux \
+	    LD_LIBRARY_PATH=${LD_LIBRARY_PATH=-/foo/bar} \
+	    flux getattr size 2>basic_rcmd.err &&
+	extract_env_command <basic_rcmd.err >basic_rcmd.env &&
+	test_must_fail grep "^PATH=" basic_rcmd.env
+'
 test -x /bin/tcsh && test_set_prereq HAVE_TCSH
 test_expect_success HAVE_TCSH 'ssh:// with local sockdir and SHELL=tcsh works' '
 	FLUX_URI=ssh://localhost${TEST_SOCKDIR} \