X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/afee8ed17a56617618fb7f963b111d7cf0fb56e7..1c03f41efa7f52dc5075d62fba14785891ad2857:/test/inc/test-pop

diff --git a/test/inc/test-pop b/test/inc/test-pop
index 7724ae3c..4e77b007 100755
--- a/test/inc/test-pop
+++ b/test/inc/test-pop
@@ -24,7 +24,8 @@ setup_test
 
 TESTUSER=testuser
 TESTPASS=testuserpass
-testport=65413
+arith_eval 64001 + `id -u` % 1000
+testport=$arith_val
 
 HOME="${MH_TEST_DIR}"; export HOME
 netrc="${HOME}/.netrc"
@@ -49,8 +50,8 @@ Hey man, how's it going?
 Hope you're doing better.
 EOM
 
-pid=`"${MH_OBJ_DIR}/test/fakepop" "$testmessage" "$testport" \
-			"$TESTUSER" "$TESTPASS"`
+pid=`"${MH_OBJ_DIR}/test/fakepop" "$testport" \
+			"$TESTUSER" "$TESTPASS" "$testmessage"`
 
 run_test "inc -user ${TESTUSER} -host 127.0.0.1 -port $testport -width 80" \
 	"Incorporating new mail into inbox...
@@ -59,8 +60,8 @@ run_test "inc -user ${TESTUSER} -host 127.0.0.1 -port $testport -width 80" \
 check $testmessage `mhpath +inbox 11` 'keep first'
 
 # check -pack
-pid=`"${MH_OBJ_DIR}/test/fakepop" "$testmessage" "$testport" \
-			"$TESTUSER" "$TESTPASS"`
+pid=`"${MH_OBJ_DIR}/test/fakepop" "$testport" \
+			"$TESTUSER" "$TESTPASS" "$testmessage"`
 
 touch "$MH_TEST_DIR/inc.mbox"
 run_test "inc -user ${TESTUSER} -host 127.0.0.1 -port $testport -width 80 \
@@ -68,11 +69,39 @@ run_test "inc -user ${TESTUSER} -host 127.0.0.1 -port $testport -width 80 \
 	"Incorporating new mail into (null)...
 
    1  12/17 No Such User       Hello<<Hey man, how's it going? . Hope you're do"
-run_test "inc -file $MH_TEST_DIR/inc.mbox -truncate" \
+run_test "inc -file $MH_TEST_DIR/inc.mbox -truncate -width 80" \
 	"Incorporating new mail into inbox...
 
   11+ 12/17 No Such User       Hello<<Hey man, how's it going? . Hope you're do"
 
+check $testmessage `mhpath +inbox 11` 'keep first'
+rm -f "$MH_TEST_DIR/inc.mbox" "$MH_TEST_DIR/.inc.map" "$netrc"
+
+# check credentials: file
+# Redirect stdin so that inc doesn't wait on the user if it can't
+# read the netrc file, even though that shouldn't happen.
+TESTUSER=differenuser
+TESTPASS=differentpass
+
+netrc="${HOME}/.mhnetrc"
+echo "default login ${TESTUSER} password ${TESTPASS}" > "$netrc"
+chmod 600 "$netrc"
+echo "credentials: file:${netrc}" >>$MH
+
+pid=`"${MH_OBJ_DIR}/test/fakepop" "$testport" \
+			"$TESTUSER" "$TESTPASS" "$testmessage"`
+
+touch "$MH_TEST_DIR/inc.mbox"
+run_test "inc -user ${TESTUSER} -host 127.0.0.1 -port $testport -width 65 \
+          -pack $MH_TEST_DIR/inc.mbox" \
+	"Incorporating new mail into (null)...
+
+   1  12/17 No Such User       Hello<<Hey man, how's it going? ." </dev/null
+run_test "inc -file $MH_TEST_DIR/inc.mbox -truncate -width 65" \
+	"Incorporating new mail into inbox...
+
+  11+ 12/17 No Such User       Hello<<Hey man, how's it going? ." </dev/null
+
 check $testmessage `mhpath +inbox 11`
 rm -f "$MH_TEST_DIR/inc.mbox" "$MH_TEST_DIR/.inc.map" "$netrc"