admin/libiscsi
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

TESTS: since we track expcmdsn we dont need to keep the old value around in a static variable

Browse Source
This commit is contained in:
Ronnie Sahlberg
2013-04-30 19:17:59 -07:00
parent b7dd6b533b
commit d38cf7cfcd
2 changed files with 2 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
test-tool/test_iscsi_cmdsn_toohigh.c
View File

@@ -28,20 +28,14 @@ static int change_cmdsn;
static int my_iscsi_queue_pdu(struct iscsi_context *iscsi, struct iscsi_pdu *pdu) static int my_iscsi_queue_pdu(struct iscsi_context *iscsi, struct iscsi_pdu *pdu)
{ {
static uint32_t old_cmdsn;
switch (change_cmdsn) { switch (change_cmdsn) {
case 1: case 1:
old_cmdsn = *(uint32_t *)&pdu->outdata.data[24];
/* change the cmdsn so it becomes too big */ /* change the cmdsn so it becomes too big */
*(uint32_t *)&pdu->outdata.data[24] = htonl(iscsi->maxcmdsn + 1); *(uint32_t *)&pdu->outdata.data[24] = htonl(iscsi->maxcmdsn + 1);
/* fudge the cmdsn value back to where it should be if this /* fudge the cmdsn value back to where it should be if this
* pdu is ignored. * pdu is ignored.
*/ */
iscsi->cmdsn--; iscsi->cmdsn = iscsi->expcmdsn;
break;
case 2:
*(uint32_t *)&pdu->outdata.data[24] = old_cmdsn;
break; break;
} }
@@ -81,7 +75,6 @@ void test_iscsi_cmdsn_toohigh(void)
iscsi_set_noautoreconnect(iscsic, 0); iscsi_set_noautoreconnect(iscsic, 0);
logging(LOG_VERBOSE, "Send a TESTUNITREADY with CMDSN == EXPCMDSN. should work again"); logging(LOG_VERBOSE, "Send a TESTUNITREADY with CMDSN == EXPCMDSN. should work again");
change_cmdsn = 2;
ret = testunitready(iscsic, tgt_lun); ret = testunitready(iscsic, tgt_lun);
CU_ASSERT_EQUAL(ret, 0); CU_ASSERT_EQUAL(ret, 0);

9
test-tool/test_iscsi_cmdsn_toolow.c
View File

@@ -28,20 +28,14 @@ static int change_cmdsn;
static int my_iscsi_queue_pdu(struct iscsi_context *iscsi, struct iscsi_pdu *pdu) static int my_iscsi_queue_pdu(struct iscsi_context *iscsi, struct iscsi_pdu *pdu)
{ {
static uint32_t old_cmdsn;
switch (change_cmdsn) { switch (change_cmdsn) {
case 1: case 1:
old_cmdsn = *(uint32_t *)&pdu->outdata.data[24];
/* change the cmdsn so it becomes too big */ /* change the cmdsn so it becomes too big */
*(uint32_t *)&pdu->outdata.data[24] = htonl(iscsi->expcmdsn + 1); *(uint32_t *)&pdu->outdata.data[24] = htonl(iscsi->expcmdsn + 1);
/* fudge the cmdsn value back to where it should be if this /* fudge the cmdsn value back to where it should be if this
* pdu is ignored. * pdu is ignored.
*/ */
iscsi->cmdsn--; iscsi->cmdsn = iscsi->expcmdsn;
break;
case 2:
*(uint32_t *)&pdu->outdata.data[24] = old_cmdsn;
break; break;
} }
@@ -82,7 +76,6 @@ void test_iscsi_cmdsn_toolow(void)
iscsi_set_noautoreconnect(iscsic, 0); iscsi_set_noautoreconnect(iscsic, 0);
logging(LOG_VERBOSE, "Send a TESTUNITREADY with CMDSN == EXPCMDSN. should work again"); logging(LOG_VERBOSE, "Send a TESTUNITREADY with CMDSN == EXPCMDSN. should work again");
change_cmdsn = 2;
ret = testunitready(iscsic, tgt_lun); ret = testunitready(iscsic, tgt_lun);
CU_ASSERT_EQUAL(ret, 0); CU_ASSERT_EQUAL(ret, 0);