[devel] [PATCH 1 of 1] IMMTEST: Cleanup the code and fix memory problem [#552]

[Zoran Milinkovic]

 tests/immsv/common/immtest.c                                |  8 +++++++-
 tests/immsv/implementer/test_SaImmOiRtAttrUpdateCallbackT.c |  2 +-
 tests/immsv/management/test_saImmOmAdminOwnerFinalize.c     |  1 +
 tests/immsv/management/test_saImmOmInitialize.c             |  1 +
 tests/immsv/management/test_saImmOmSearchInitialize_2.c     |  2 +-
 5 files changed, 11 insertions(+), 3 deletions(-)


diff --git a/tests/immsv/common/immtest.c b/tests/immsv/common/immtest.c
--- a/tests/immsv/common/immtest.c
+++ b/tests/immsv/common/immtest.c
@@ -18,6 +18,7 @@
 #include <stdlib.h>
 #include <sys/time.h>
 #include <unistd.h>
+#include <pthread.h>
 #include "immtest.h"
 
 SaVersionT immVersion = {'A', 0x02, 0x011}; 
@@ -54,7 +55,12 @@ int main(int argc, char **argv)
         return 0;
     }
 
-    return test_run(suite, tcase);
+    int rc = test_run(suite, tcase);
+
+    /* Added pthread_exit() to remove dlopen@@GLIBC leak from valgrind */
+    pthread_exit(NULL);
+
+    return rc;
 }  
 
 SaAisErrorT config_class_create(SaImmHandleT immHandle)
diff --git a/tests/immsv/implementer/test_SaImmOiRtAttrUpdateCallbackT.c 
b/tests/immsv/implementer/test_SaImmOiRtAttrUpdateCallbackT.c
--- a/tests/immsv/implementer/test_SaImmOiRtAttrUpdateCallbackT.c
+++ b/tests/immsv/implementer/test_SaImmOiRtAttrUpdateCallbackT.c
@@ -138,9 +138,9 @@ static void *test_saImmOmAccessorGet_2(v
     safassert(saImmOmInitialize(&immOmHandle, &immOmCallbacks, &immVersion), 
SA_AIS_OK);
     safassert(saImmOmAccessorInitialize(immOmHandle, &accessorHandle), 
SA_AIS_OK);
     safassert(saImmOmAccessorGet_2(accessorHandle, dn, attributeNames, 
&attributes), SA_AIS_OK);
-    safassert(saImmOmFinalize(immOmHandle), SA_AIS_OK);
     assert(attributes[0]->attrValueType == SA_IMM_ATTR_SAINT32T);
     assert(*((SaInt32T*) attributes[0]->attrValues[0]) == int1Value);
+    safassert(saImmOmFinalize(immOmHandle), SA_AIS_OK);
 
     TRACE_LEAVE();
     return NULL;
diff --git a/tests/immsv/management/test_saImmOmAdminOwnerFinalize.c 
b/tests/immsv/management/test_saImmOmAdminOwnerFinalize.c
--- a/tests/immsv/management/test_saImmOmAdminOwnerFinalize.c
+++ b/tests/immsv/management/test_saImmOmAdminOwnerFinalize.c
@@ -74,4 +74,5 @@ void saImmOmAdminOwnerFinalize_03(void)
 
     /* Cleanup */ 
     safassert(saImmOmAdminOwnerFinalize(rudeGuyHandle), SA_AIS_OK);
+    safassert(saImmOmFinalize(immOmHandle), SA_AIS_OK);
 }
diff --git a/tests/immsv/management/test_saImmOmInitialize.c 
b/tests/immsv/management/test_saImmOmInitialize.c
--- a/tests/immsv/management/test_saImmOmInitialize.c
+++ b/tests/immsv/management/test_saImmOmInitialize.c
@@ -240,6 +240,7 @@ void saImmOmInitialize_10(void)
 
     test_validate(rc, SA_AIS_OK);
 
+    safassert(saImmOmFinalize(immOmHandle), SA_AIS_OK);
 }
 
 void saImmOmInitialize_11(void)
diff --git a/tests/immsv/management/test_saImmOmSearchInitialize_2.c 
b/tests/immsv/management/test_saImmOmSearchInitialize_2.c
--- a/tests/immsv/management/test_saImmOmSearchInitialize_2.c
+++ b/tests/immsv/management/test_saImmOmSearchInitialize_2.c
@@ -53,7 +53,7 @@ void saImmOmSearchInitialize_2_03(void)
 
 void saImmOmSearchInitialize_2_04(void)
 {
-    SaImmSearchHandleT searchHandle;
+    SaImmSearchHandleT searchHandle = -1;
 
     safassert(saImmOmInitialize(&immOmHandle, &immOmCallbacks, &immVersion), 
SA_AIS_OK);
     rc = saImmOmSearchInitialize_2(immOmHandle, NULL, SA_IMM_ONE,

------------------------------------------------------------------------------
How ServiceNow helps IT people transform IT departments:
1. Consolidate legacy IT systems to a single system of record for IT
2. Standardize and globalize service processes across IT
3. Implement zero-touch automation to replace manual, redundant tasks
http://pubads.g.doubleclick.net/gampad/clk?id=51271111&iu=/4140/ostg.clktrk
_______________________________________________
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel