X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fcontrol%2Fut_ctrl_submgr_test.go;h=038c20ac88c7aaf56f670e553423baf9469e87fc;hb=fe2cdabf98e8d1028bbe1713daa187e538f042a0;hp=9ffda38fa6a50aa1423da324f0382d7b37d7b51d;hpb=39d94ea1dd0e04ee6da8742d133393ce6ed3200c;p=ric-plt%2Fsubmgr.git

diff --git a/pkg/control/ut_ctrl_submgr_test.go b/pkg/control/ut_ctrl_submgr_test.go
index 9ffda38..038c20a 100644
--- a/pkg/control/ut_ctrl_submgr_test.go
+++ b/pkg/control/ut_ctrl_submgr_test.go
@@ -120,12 +120,12 @@ func PringSubscriptionQueryResult(resp models.SubscriptionList) {
 func (mc *testingSubmgrControl) wait_registry_empty(t *testing.T, secs int) bool {
 	cnt := int(0)
 	i := 1
-	for ; i <= secs*2; i++ {
+	for ; i <= secs*10; i++ {
 		cnt = len(mc.c.registry.register)
 		if cnt == 0 {
 			return true
 		}
-		time.Sleep(500 * time.Millisecond)
+		time.Sleep(100 * time.Millisecond)
 	}
 	mc.TestError(t, "(submgr) no registry empty within %d secs: %d", secs, cnt)
 	return false
@@ -139,14 +139,14 @@ func (mc *testingSubmgrControl) get_registry_next_subid(t *testing.T) uint32 {
 
 func (mc *testingSubmgrControl) wait_registry_next_subid_change(t *testing.T, origSubId uint32, secs int) (uint32, bool) {
 	i := 1
-	for ; i <= secs*2; i++ {
+	for ; i <= secs*10; i++ {
 		mc.c.registry.mutex.Lock()
 		currSubId := mc.c.registry.subIds[0]
 		mc.c.registry.mutex.Unlock()
 		if currSubId != origSubId {
 			return currSubId, true
 		}
-		time.Sleep(500 * time.Millisecond)
+		time.Sleep(100 * time.Millisecond)
 	}
 	mc.TestError(t, "(submgr) no subId change within %d secs", secs)
 	return 0, false
@@ -155,12 +155,12 @@ func (mc *testingSubmgrControl) wait_registry_next_subid_change(t *testing.T, or
 func (mc *testingSubmgrControl) wait_subs_clean(t *testing.T, e2SubsId uint32, secs int) bool {
 	var subs *Subscription
 	i := 1
-	for ; i <= secs*2; i++ {
+	for ; i <= secs*10; i++ {
 		subs = mc.c.registry.GetSubscription(e2SubsId)
 		if subs == nil {
 			return true
 		}
-		time.Sleep(500 * time.Millisecond)
+		time.Sleep(100 * time.Millisecond)
 	}
 	if subs != nil {
 		mc.TestError(t, "(submgr) no clean within %d secs: %s", secs, subs.String())
@@ -171,27 +171,23 @@ func (mc *testingSubmgrControl) wait_subs_clean(t *testing.T, e2SubsId uint32, s
 }
 
 func (mc *testingSubmgrControl) wait_multi_subs_clean(t *testing.T, e2SubsIds []uint32, secs int) bool {
-	var subs *Subscription
-	var purgedSubscriptions int
-	i := 1
-	k := 0
-	for ; i <= secs*2; i++ {
+
+	purgedSubscriptions := 0
+
+	for i := 1; i <= secs*10; i++ {
 		purgedSubscriptions = 0
-		for k = 0; k <= len(e2SubsIds); i++ {
-			subs = mc.c.registry.GetSubscription(e2SubsIds[k])
+		for k := 0; k <= len(e2SubsIds); i++ {
+			subs := mc.c.registry.GetSubscription(e2SubsIds[k])
 			if subs == nil {
 				mc.TestLog(t, "(submgr) subscriber purged for esSubsId %v", e2SubsIds[k])
 				purgedSubscriptions += 1
 				if purgedSubscriptions == len(e2SubsIds) {
 					return true
-				} else {
-					continue
 				}
-			} else {
-				mc.TestLog(t, "(submgr) subscriber %s no clean within %d secs: subs(N/A) - purged subscriptions %v", subs.String(), secs, purgedSubscriptions)
-				time.Sleep(500 * time.Millisecond)
 			}
 		}
+		mc.TestLog(t, "(submgr) subscriptions pending purging %v/%v after %d msecs", purgedSubscriptions, len(e2SubsIds), i+500)
+		time.Sleep(100 * time.Millisecond)
 	}
 
 	mc.TestError(t, "(submgr) no clean within %d secs: subs(N/A) - %v/%v subscriptions found still", secs, purgedSubscriptions, len(e2SubsIds))
@@ -202,7 +198,7 @@ func (mc *testingSubmgrControl) wait_multi_subs_clean(t *testing.T, e2SubsIds []
 func (mc *testingSubmgrControl) wait_subs_trans_clean(t *testing.T, e2SubsId uint32, secs int) bool {
 	var trans TransactionIf
 	i := 1
-	for ; i <= secs*2; i++ {
+	for ; i <= secs*10; i++ {
 		subs := mc.c.registry.GetSubscription(e2SubsId)
 		if subs == nil {
 			return true
@@ -211,7 +207,7 @@ func (mc *testingSubmgrControl) wait_subs_trans_clean(t *testing.T, e2SubsId uin
 		if trans == nil {
 			return true
 		}
-		time.Sleep(500 * time.Millisecond)
+		time.Sleep(100 * time.Millisecond)
 	}
 	if trans != nil {
 		mc.TestError(t, "(submgr) no clean within %d secs: %s", secs, trans.String())
@@ -239,12 +235,12 @@ func (mc *testingSubmgrControl) wait_subs_entrypoint_cnt_change(t *testing.T, or
 	}
 
 	i := 1
-	for ; i <= secs*2; i++ {
+	for ; i <= secs*10; i++ {
 		curr := subs.EpList.Size()
 		if curr != orig {
 			return curr, true
 		}
-		time.Sleep(500 * time.Millisecond)
+		time.Sleep(100 * time.Millisecond)
 	}
 	mc.TestError(t, "(submgr) no subs %d entrypoint cnt change within %d secs", origSubId, secs)
 	return 0, false
@@ -259,12 +255,12 @@ func (mc *testingSubmgrControl) get_msgcounter(t *testing.T) uint64 {
 
 func (mc *testingSubmgrControl) wait_msgcounter_change(t *testing.T, orig uint64, secs int) (uint64, bool) {
 	i := 1
-	for ; i <= secs*2; i++ {
+	for ; i <= secs*10; i++ {
 		curr := mc.c.CntRecvMsg
 		if curr != orig {
 			return curr, true
 		}
-		time.Sleep(500 * time.Millisecond)
+		time.Sleep(100 * time.Millisecond)
 	}
 	mc.TestError(t, "(submgr) no msg counter change within %d secs", secs)
 	return 0, false