patch 'test/crypto: fix statistics error messages' has been queued to stable release 22.11.2

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 22.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 04/11/23. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://git.dpdk.org/dpdk-stable/log/?h=22.11-staging

This queued commit can be viewed at:
https://git.dpdk.org/dpdk-stable/log/?h=22.11-staging/commit/fcf7e0e6f7c46fa0d566b3bc3602c72b786f5be1

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From fcf7e0e6f7c46fa0d566b3bc3602c72b786f5be1 Mon Sep 17 00:00:00 2001
From: Saoirse O'Donovan <saoirse.odonovan at intel.com>
Date: Mon, 20 Mar 2023 09:29:56 +0000
Subject: [PATCH] test/crypto: fix statistics error messages
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit 051af8d174dd0f100f407269c25c007216c912ad ]

The test stats testcase was printing the same error message for
multiple errors in the test stats testcase. This is now replaced
with descriptive error messages, which match the cause of the failure.

Fixes: 202d375c60bc ("app/test: add cryptodev unit and performance tests")

Signed-off-by: Saoirse O'Donovan <saoirse.odonovan at intel.com>
Acked-by: Ciara Power <ciara.power at intel.com>
---
 .mailmap                  |  1 +
 app/test/test_cryptodev.c | 12 ++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.mailmap b/.mailmap
index 039d487d6d..c09043056c 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1168,6 +1168,7 @@ Sangjin Han <sangjin at eecs.berkeley.edu>
 Sankar Chokkalingam <sankarx.chokkalingam at intel.com>
 Santoshkumar Karanappa Rastapur <santosh.rastapur at broadcom.com>
 Santosh Shukla <santosh.shukla at caviumnetworks.com> <sshukla at mvista.com>
+Saoirse O'Donovan <saoirse.odonovan at intel.com>
 Saori Usami <susami at igel.co.jp>
 Sarath Somasekharan <sarathx.somasekharan at intel.com>
 Sarosh Arif <sarosh.arif at emumba.com>
diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c
index 7be4bf40b8..0df4e9fca1 100644
--- a/app/test/test_cryptodev.c
+++ b/app/test/test_cryptodev.c
@@ -11992,11 +11992,11 @@ test_stats(void)
 	TEST_ASSERT((stats.enqueued_count == 1),
 		"rte_cryptodev_stats_get returned unexpected enqueued stat");
 	TEST_ASSERT((stats.dequeued_count == 1),
-		"rte_cryptodev_stats_get returned unexpected enqueued stat");
+		"rte_cryptodev_stats_get returned unexpected dequeued stat");
 	TEST_ASSERT((stats.enqueue_err_count == 0),
-		"rte_cryptodev_stats_get returned unexpected enqueued stat");
+		"rte_cryptodev_stats_get returned unexpected enqueued error count stat");
 	TEST_ASSERT((stats.dequeue_err_count == 0),
-		"rte_cryptodev_stats_get returned unexpected enqueued stat");
+		"rte_cryptodev_stats_get returned unexpected dequeued error count stat");
 
 	/* invalid device but should ignore and not reset device stats*/
 	rte_cryptodev_stats_reset(ts_params->valid_devs[0] + 300);
@@ -12004,7 +12004,7 @@ test_stats(void)
 			&stats),
 		"rte_cryptodev_stats_get failed");
 	TEST_ASSERT((stats.enqueued_count == 1),
-		"rte_cryptodev_stats_get returned unexpected enqueued stat");
+		"rte_cryptodev_stats_get returned unexpected enqueued stat after invalid reset");
 
 	/* check that a valid reset clears stats */
 	rte_cryptodev_stats_reset(ts_params->valid_devs[0]);
@@ -12012,9 +12012,9 @@ test_stats(void)
 			&stats),
 					  "rte_cryptodev_stats_get failed");
 	TEST_ASSERT((stats.enqueued_count == 0),
-		"rte_cryptodev_stats_get returned unexpected enqueued stat");
+		"rte_cryptodev_stats_get returned unexpected enqueued stat after valid reset");
 	TEST_ASSERT((stats.dequeued_count == 0),
-		"rte_cryptodev_stats_get returned unexpected enqueued stat");
+		"rte_cryptodev_stats_get returned unexpected dequeued stat after valid reset");
 
 	return TEST_SUCCESS;
 }
-- 
2.25.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-04-09 21:45:42.224267800 +0800
+++ 0135-test-crypto-fix-statistics-error-messages.patch	2023-04-09 21:45:38.819042200 +0800
@@ -1 +1 @@
-From 051af8d174dd0f100f407269c25c007216c912ad Mon Sep 17 00:00:00 2001
+From fcf7e0e6f7c46fa0d566b3bc3602c72b786f5be1 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 051af8d174dd0f100f407269c25c007216c912ad ]
@@ -11 +13,0 @@
-Cc: stable at dpdk.org
@@ -21 +23 @@
-index dc30369117..cac02a6f48 100644
+index 039d487d6d..c09043056c 100644
@@ -24 +26 @@
-@@ -1182,6 +1182,7 @@ Sangjin Han <sangjin at eecs.berkeley.edu>
+@@ -1168,6 +1168,7 @@ Sangjin Han <sangjin at eecs.berkeley.edu>
@@ -33 +35 @@
-index f4648755e5..9c670e9a35 100644
+index 7be4bf40b8..0df4e9fca1 100644
@@ -36 +38 @@
-@@ -12341,11 +12341,11 @@ test_stats(void)
+@@ -11992,11 +11992,11 @@ test_stats(void)
@@ -51 +53 @@
-@@ -12353,7 +12353,7 @@ test_stats(void)
+@@ -12004,7 +12004,7 @@ test_stats(void)
@@ -60 +62 @@
-@@ -12361,9 +12361,9 @@ test_stats(void)
+@@ -12012,9 +12012,9 @@ test_stats(void)