From d790209a8a9335162f747d2e954f5df106281129 Mon Sep 17 00:00:00 2001 From: Ronnie Sahlberg Date: Sat, 9 May 2015 15:47:15 -0700 Subject: [PATCH] TESTS: use TGTPORTAL instead of a hardcoded port Signed-off-by: Ronnie Sahlberg --- tests/test_1000_chap.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/test_1000_chap.sh b/tests/test_1000_chap.sh index 062b4a8..db87974 100755 --- a/tests/test_1000_chap.sh +++ b/tests/test_1000_chap.sh @@ -16,26 +16,26 @@ success echo -n "Test logging in with invalid user (should fail) ... " LIBISCSI_CHAP_USERNAME=wrong \ LIBISCSI_CHAP_PASSWORD=libiscsi \ -../utils/iscsi-inq -i ${IQNINITIATOR} iscsi://127.0.0.1:3260/${IQNTARGET}/1 > /dev/null && failure +../utils/iscsi-inq -i ${IQNINITIATOR} iscsi://${TGTPORTAL}/${IQNTARGET}/1 > /dev/null && failure success echo -n "Test logging in with wrong password (should fail) ... " LIBISCSI_CHAP_USERNAME=libiscsi \ LIBISCSI_CHAP_PASSWORD=wrong \ -../utils/iscsi-inq -i ${IQNINITIATOR} iscsi://127.0.0.1:3260/${IQNTARGET}/1 > /dev/null && failure +../utils/iscsi-inq -i ${IQNINITIATOR} iscsi://${TGTPORTAL}/${IQNTARGET}/1 > /dev/null && failure success echo -n "Test logging in with correct credentials (ENV) ... " LIBISCSI_CHAP_USERNAME=libiscsi \ LIBISCSI_CHAP_PASSWORD=libiscsi \ -../utils/iscsi-inq -i ${IQNINITIATOR} iscsi://127.0.0.1:3260/${IQNTARGET}/1 > /dev/null || failure +../utils/iscsi-inq -i ${IQNINITIATOR} iscsi://${TGTPORTAL}/${IQNTARGET}/1 > /dev/null || failure success echo -n "Test logging in with correct credentials (URL) ... " -../utils/iscsi-inq -i ${IQNINITIATOR} iscsi://libiscsi%libiscsi@127.0.0.1:3260/${IQNTARGET}/1 > /dev/null || failure +../utils/iscsi-inq -i ${IQNINITIATOR} iscsi://libiscsi%libiscsi@${TGTPORTAL}/${IQNTARGET}/1 > /dev/null || failure success @@ -44,7 +44,7 @@ LIBISCSI_CHAP_USERNAME=libiscsi \ LIBISCSI_CHAP_PASSWORD=libiscsi \ LIBISCSI_CHAP_TARGET_USERNAME=wrong \ LIBISCSI_CHAP_TARGET_PASSWORD=outgoing \ -../utils/iscsi-inq -i ${IQNINITIATOR} iscsi://127.0.0.1:3260/${IQNTARGET}/1 > /dev/null && failure +../utils/iscsi-inq -i ${IQNINITIATOR} iscsi://${TGTPORTAL}/${IQNTARGET}/1 > /dev/null && failure success @@ -53,7 +53,7 @@ LIBISCSI_CHAP_USERNAME=libiscsi \ LIBISCSI_CHAP_PASSWORD=libiscsi \ LIBISCSI_CHAP_TARGET_USERNAME=outgoing \ LIBISCSI_CHAP_TARGET_PASSWORD=wrong \ -../utils/iscsi-inq -i ${IQNINITIATOR} iscsi://127.0.0.1:3260/${IQNTARGET}/1 > /dev/null && failure +../utils/iscsi-inq -i ${IQNINITIATOR} iscsi://${TGTPORTAL}/${IQNTARGET}/1 > /dev/null && failure success @@ -62,7 +62,7 @@ LIBISCSI_CHAP_USERNAME=libiscsi \ LIBISCSI_CHAP_PASSWORD=libiscsi \ LIBISCSI_CHAP_TARGET_USERNAME=outgoing \ LIBISCSI_CHAP_TARGET_PASSWORD=outgoing \ -../utils/iscsi-inq -i ${IQNINITIATOR} iscsi://127.0.0.1:3260/${IQNTARGET}/1 > /dev/null || failure +../utils/iscsi-inq -i ${IQNINITIATOR} iscsi://${TGTPORTAL}/${IQNTARGET}/1 > /dev/null || failure success