X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2FPapiExecutor.py;h=ecee70c9c5e14ee284c9e65652145bb31a73273b;hp=7bfc8614a5b612e42fe055ec2852f752c21c23dd;hb=b6606e7625e308a66bdfb9d5a9c065b58e429a99;hpb=bd5eec0c49d4db896eab08ab3feb467f5d14ccc8

diff --git a/resources/libraries/python/PapiExecutor.py b/resources/libraries/python/PapiExecutor.py
index 7bfc8614a5..ecee70c9c5 100644
--- a/resources/libraries/python/PapiExecutor.py
+++ b/resources/libraries/python/PapiExecutor.py
@@ -794,16 +794,17 @@ class PapiSocketExecutor:
             if not isinstance(reply, list):
                 reply = [reply]
             for item in reply:
-                self.crc_checker.check_api_name(item.__class__.__name__)
+                message_name = item.__class__.__name__
+                self.crc_checker.check_api_name(message_name)
                 dict_item = dictize(item)
                 if u"retval" in dict_item.keys():
                     # *_details messages do not contain retval.
                     retval = dict_item[u"retval"]
                     if retval != exp_rv:
-                        # TODO: What exactly to log and raise here?
                         raise AssertionError(
                             f"Retval {retval!r} does not match expected "
-                            f"retval {exp_rv!r}"
+                            f"retval {exp_rv!r} in message {message_name} "
+                            f"for command {command}."
                         )
                 replies.append(dict_item)
         return replies