Eliminate commit of most expected unit-test HWPF errors

Change-Id: I9da47879e54db63fbc086b622039909f2e48504b
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/510
Tested-by: Jenkins Server
Reviewed-by: MIKE J. JONES <mjjones@us.ibm.com>

3 files changed, 13 insertions, 10 deletions

diff --git a/src/usr/hwpf/hwp/fapiTestHwpAttr.C b/src/usr/hwpf/hwp/fapiTestHwpAttr.C
index 55281cf6d..8c6b117ad 100755
--- a/src/usr/hwpf/hwp/fapiTestHwpAttr.C
+++ b/src/usr/hwpf/hwp/fapiTestHwpAttr.C
@@ -820,9 +820,11 @@ fapi::ReturnCode hwpTestAttributes()
 
         if (l_rc)
         {
-            FAPI_INF("hwpTestAttributes: Logging expected error 0x%x from fapiGetInitFileAttr",
+            // Delete the error rather than logging it to avoid it getting
+            // interpreted as a real problem
+            FAPI_INF("hwpTestAttributes: Deleting expected error 0x%x from fapiGetInitFileAttr",
                      static_cast<uint32_t>(l_rc));
-            fapiLogError(l_rc);
+            l_rc = fapi::FAPI_RC_SUCCESS;
             break;
         }
         else
diff --git a/src/usr/hwpf/test/hwpftest.H b/src/usr/hwpf/test/hwpftest.H
index 9ee01f465..c46613c3a 100644
--- a/src/usr/hwpf/test/hwpftest.H
+++ b/src/usr/hwpf/test/hwpftest.H
@@ -96,8 +96,11 @@ public:
 
         if (l_err)
         {
-            TS_TRACE("testHwpf2: Unit Test passed. hwpTestError failed. Error logged");
-            errlCommit(l_err,HWPF_COMP_ID);
+            // Delete the error rather than committing it to avoid it getting
+            // interpreted as a real problem
+            TS_TRACE("testHwpf2: Unit Test passed. hwpTestError failed. Error deleted");
+            delete l_err;
+            l_err = NULL;
         }
         else
         {
diff --git a/src/usr/targeting/test/targetingtest.H b/src/usr/targeting/test/targetingtest.H
index 95f21f344..3c684ed62 100644
--- a/src/usr/targeting/test/targetingtest.H
+++ b/src/usr/targeting/test/targetingtest.H
@@ -1160,12 +1160,10 @@ class TargetingTestSuite: public CxxTest::TestSuite
         {
             TS_FAIL("Should have been a platform handled error");
         }
-        else
-        {
-            errlHndl_t l_pErrLog = static_cast<ERRORLOG::ErrlEntry*>(
-                                                                     l_rc.releasePlatData());
-            ERRORLOG::errlCommit(l_pErrLog,TARG_COMP_ID);
-        }
+
+        // The error log will get deleted when the ReturnCode is destructed. The
+        // error log is not committed here to avoid it getting interpreted as a
+        // real problem
 
         delete l_pFapiTarget;
         l_pFapiTarget = NULL;