X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fsi95_test.c;fp=test%2Fsi95_test.c;h=fd6dd56dbc6264d2fb6f4578e74d30f70bcab132;hb=fc2112d22bf69b4bfbe0c419ed366f0d0ec370ca;hp=c77f3899b17330736b7fff9137eb8a94077cf764;hpb=e3a021c1e7bc4bdb877cd12601a55c7e3f74437e;p=ric-plt%2Flib%2Frmr.git

diff --git a/test/si95_test.c b/test/si95_test.c
index c77f389..fd6dd56 100644
--- a/test/si95_test.c
+++ b/test/si95_test.c
@@ -21,7 +21,7 @@
 /*
 	Mmemonic:	si95_test.c
 	Abstract:	This is the main driver to test the si95 core functions
-				(within rmr/src/si/src/si95). 
+				(within rmr/src/si/src/si95).
 
 	Author:		E. Scott Daniels
 	Date:		6 March 2018
@@ -58,7 +58,7 @@
 #define DEBUG 1
 
 											// specific test tools in this directory
-#undef NNG_UNDER_TEST 						// NNG is NOT under test so undefine if set
+#undef NNG_UNDER_TEST						// NNG is NOT under test so undefine if set
 #define NO_EMULATION 1						// no emulation of transport functions
 #define NO_PRIVATE_HEADERS 1				// no rmr_si or rmr_nng headers
 #define NO_DUMMY_RMR 1						// no msg things
@@ -127,7 +127,7 @@ static int memory( ) {
 		((struct tp_blk *)ptr)->squeue = iptr;
 		SItrash(  TP_BLK, ptr );
 	}
-	
+
 	ptr = SInew( GI_BLK );
 	errors += fail_if_nil( ptr, "memory: sinew returned nil when given giblk request" );
 	SItrash(  GI_BLK, ptr );		// GI block cannot be trashed, ensure this (valgind will complain about a leak)
@@ -155,7 +155,7 @@ static int init() {
 
 static int cleanup() {
 	int errors = 0;
-	
+
 	if( ! si_ctx ) {
 		return 0;
 	}
@@ -163,8 +163,9 @@ static int cleanup() {
 	SItp_stats( si_ctx );		// drive for coverage only
 	SItp_stats( NULL );
 
-	SIconnect( si_ctx, "localhost:43086" ); 	// ensure context has a tp block to free on shutdown
-	SIshutdown( si_ctx );
+	SIconnect( si_ctx, "localhost:43086" );	// ensure context has a tp block to free on shutdown
+	SIshutdown( NULL );
+	SIabort( si_ctx );
 
 
 	fprintf( stderr, "<INFO> cleanup  module finished with %d errors\n", errors );
@@ -194,9 +195,8 @@ static int addr() {
 	l = SIaddress( buf1, (void **)  &dest, AC_TOADDR6 );
 	errors += fail_if_true( l > 0, "to addr6 with bad addr convdersion returned valid len" );
 
-	snprintf( buf1, sizeof( buf1 ), "[ff02::5]:4002" );		// v6 might not be supported so failure is OK here
+	snprintf( buf1, sizeof( buf1 ), "[ff02::5]:4002" );		// v6 might not be supported so failure is OK here; driving for coverage
 	l=SIaddress( buf1, (void **) &dest, AC_TOADDR6 );
-	errors += fail_if_true( l < 1, "to addr convdersion failed" );
 
 	snprintf( buf1, sizeof( buf1 ), "localhost:43086" );
 	l = SIaddress( buf1, (void **) &dest, AC_TOADDR );
@@ -222,11 +222,11 @@ static int conn( ) {
 	state = SIconnect( si_ctx, "localhost:4567" );		// driver regular connect
 	errors += fail_if_true( state < 0, "connect to low port failed" );
 
-	state = SIconnect( si_ctx, "localhost:43086" ); 	// drive save connect with good return code
+	state = SIconnect( si_ctx, "localhost:43086" );		// drive save connect with good return code
 	errors += fail_if_true( state < 0, "connect to high port failed" );
 
 	tpem_set_addr_dup_state( 1 );				// force get sockket name emulation to return a duplicate address
-	state = SIconnect( si_ctx, "localhost:43086" ); 	// drive save connect with good return code
+	state = SIconnect( si_ctx, "localhost:43086" );		// drive save connect with good return code
 	errors += fail_if_true( state >= 0, "forced dup connect did not return error" );
 
 	tpem_set_addr_dup_state( 0 );				// force get sockket name emulation to return a duplicate address