From 58642c6d72f10e974fdbda18eb374d007155c7e9 Mon Sep 17 00:00:00 2001 From: David Disseldorp Date: Tue, 29 May 2018 16:36:38 +0200 Subject: [PATCH] tests: drop duplicate PR-unsupported log messages The helper function -2 return paths already print this message, so the duplicate in the caller can be dropped. Signed-off-by: David Disseldorp --- test-tool/test_prin_read_keys_simple.c | 1 - test-tool/test_prin_report_caps.c | 1 - test-tool/test_prin_serviceaction_range.c | 1 - test-tool/test_prout_clear_simple.c | 1 - test-tool/test_prout_preempt.c | 1 - test-tool/test_prout_register_simple.c | 1 - test-tool/test_prout_reserve_access.c | 1 - test-tool/test_prout_reserve_ownership.c | 1 - test-tool/test_prout_reserve_simple.c | 1 - 9 files changed, 9 deletions(-) diff --git a/test-tool/test_prin_read_keys_simple.c b/test-tool/test_prin_read_keys_simple.c index 127925c..f268e96 100644 --- a/test-tool/test_prin_read_keys_simple.c +++ b/test-tool/test_prin_read_keys_simple.c @@ -39,7 +39,6 @@ test_prin_read_keys_simple(void) ret = prin_read_keys(sd, &task, NULL); if (ret == -2) { - logging(LOG_NORMAL, "[SKIPPED] PERSISTEN RESERVE IN is not implemented."); CU_PASS("PERSISTENT RESERVE IN is not implemented."); return; } diff --git a/test-tool/test_prin_report_caps.c b/test-tool/test_prin_report_caps.c index 705cfb5..8e6c302 100644 --- a/test-tool/test_prin_report_caps.c +++ b/test-tool/test_prin_report_caps.c @@ -63,7 +63,6 @@ test_prin_report_caps_simple(void) /* register our reservation key with the target */ ret = prout_register_and_ignore(sd, key); if (ret == -2) { - logging(LOG_NORMAL, "[SKIPPED] PERSISTENT RESERVE OUT is not implemented."); CU_PASS("PERSISTENT RESERVE OUT is not implemented."); return; } diff --git a/test-tool/test_prin_serviceaction_range.c b/test-tool/test_prin_serviceaction_range.c index 4551c0a..e261d6a 100644 --- a/test-tool/test_prin_serviceaction_range.c +++ b/test-tool/test_prin_serviceaction_range.c @@ -40,7 +40,6 @@ test_prin_serviceaction_range(void) /* verify PRIN/READ_KEYS works -- XXX redundant -- remove this? */ ret = prin_read_keys(sd, &task, NULL); if (ret == -2) { - logging(LOG_NORMAL, "[SKIPPED] PERSISTEN RESERVE IN is not implemented."); CU_PASS("PERSISTENT RESERVE IN is not implemented."); return; } diff --git a/test-tool/test_prout_clear_simple.c b/test-tool/test_prout_clear_simple.c index 8bcfe47..2203998 100644 --- a/test-tool/test_prout_clear_simple.c +++ b/test-tool/test_prout_clear_simple.c @@ -43,7 +43,6 @@ test_prout_clear_simple(void) /* register our reservation key with the target */ ret = prout_register_and_ignore(sd, key); if (ret == -2) { - logging(LOG_NORMAL, "[SKIPPED] PERSISTENT RESERVE OUT is not implemented."); CU_PASS("PERSISTENT RESERVE OUT is not implemented."); return; } diff --git a/test-tool/test_prout_preempt.c b/test-tool/test_prout_preempt.c index 201acca..90c0f76 100644 --- a/test-tool/test_prout_preempt.c +++ b/test-tool/test_prout_preempt.c @@ -54,7 +54,6 @@ test_prout_preempt_rm_reg(void) ret = prout_register_and_ignore(sd, k1); if (ret == -2) { - logging(LOG_NORMAL, "[SKIPPED] PERSISTEN RESERVE OUT is not implemented."); CU_PASS("PERSISTENT RESERVE OUT is not implemented."); return; } diff --git a/test-tool/test_prout_register_simple.c b/test-tool/test_prout_register_simple.c index c705875..275f692 100644 --- a/test-tool/test_prout_register_simple.c +++ b/test-tool/test_prout_register_simple.c @@ -40,7 +40,6 @@ test_prout_register_simple(void) /* register our reservation key with the target */ ret = prout_register_and_ignore(sd, key); if (ret == -2) { - logging(LOG_NORMAL, "[SKIPPED] PERSISTEN RESERVE OUT is not implemented."); CU_PASS("PERSISTENT RESERVE OUT is not implemented."); return; } diff --git a/test-tool/test_prout_reserve_access.c b/test-tool/test_prout_reserve_access.c index 4f17848..2da88e0 100644 --- a/test-tool/test_prout_reserve_access.c +++ b/test-tool/test_prout_reserve_access.c @@ -50,7 +50,6 @@ verify_persistent_reserve_access(struct scsi_device *sd1, struct scsi_device *sd /* register our reservation key with the target */ ret = prout_register_and_ignore(sd1, key); if (ret == -2) { - logging(LOG_NORMAL, "[SKIPPED] PERSISTEN RESERVE OUT is not implemented."); CU_PASS("PERSISTENT RESERVE OUT is not implemented."); return; } diff --git a/test-tool/test_prout_reserve_ownership.c b/test-tool/test_prout_reserve_ownership.c index b14478c..1b47758 100644 --- a/test-tool/test_prout_reserve_ownership.c +++ b/test-tool/test_prout_reserve_ownership.c @@ -47,7 +47,6 @@ verify_persistent_reserve_ownership(struct scsi_device *sd1, struct scsi_device /* register our reservation key with the target */ ret = prout_register_and_ignore(sd1, key1); if (ret == -2) { - logging(LOG_NORMAL, "[SKIPPED] PERSISTEN RESERVE OUT is not implemented."); CU_PASS("PERSISTENT RESERVE OUT is not implemented."); return; } diff --git a/test-tool/test_prout_reserve_simple.c b/test-tool/test_prout_reserve_simple.c index 14d4793..4f9ebbd 100644 --- a/test-tool/test_prout_reserve_simple.c +++ b/test-tool/test_prout_reserve_simple.c @@ -55,7 +55,6 @@ test_prout_reserve_simple(void) /* register our reservation key with the target */ ret = prout_register_and_ignore(sd, key); if (ret == -2) { - logging(LOG_NORMAL, "[SKIPPED] PERSISTEN RESERVE OUT is not implemented."); CU_PASS("PERSISTENT RESERVE OUT is not implemented."); return; }