Code Review
/
ric-plt
/
submgr.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Temporary fix for UT problem
[ric-plt/submgr.git]
/
pkg
/
control
/
ut_ctrl_submgr_test.go
diff --git
a/pkg/control/ut_ctrl_submgr_test.go
b/pkg/control/ut_ctrl_submgr_test.go
index
9ffda38
..
73b26e3
100644
(file)
--- a/
pkg/control/ut_ctrl_submgr_test.go
+++ b/
pkg/control/ut_ctrl_submgr_test.go
@@
-55,8
+55,10
@@
func createSubmgrControl(srcId teststub.RmrSrcId, rtgSvc teststub.RmrRtgSvc) *te
mainCtrl = &testingSubmgrControl{}
mainCtrl.RmrControl.Init("SUBMGRCTL", srcId, rtgSvc)
mainCtrl.c = NewControl()
mainCtrl = &testingSubmgrControl{}
mainCtrl.RmrControl.Init("SUBMGRCTL", srcId, rtgSvc)
mainCtrl.c = NewControl()
+ mainCtrl.c.UTTesting = true
xapp.Logger.Debug("Replacing real db with test db")
xapp.Logger.Debug("Replacing real db with test db")
- mainCtrl.c.db = CreateMock() // This overrides real database for testing
+ mainCtrl.c.e2SubsDb = CreateMock() // This overrides real E2 Subscription database for testing
+ mainCtrl.c.restSubsDb = CreateRestSubsDbMock() // This overrides real REST Subscription database for testing
xapp.SetReadyCB(mainCtrl.ReadyCB, nil)
go xapp.RunWithParams(mainCtrl.c, false)
mainCtrl.WaitCB()
xapp.SetReadyCB(mainCtrl.ReadyCB, nil)
go xapp.RunWithParams(mainCtrl.c, false)
mainCtrl.WaitCB()
@@
-69,6
+71,7
@@
func (mc *testingSubmgrControl) SimulateRestart(t *testing.T) {
mainCtrl.c.registry.subIds = nil
// Initialize subIds slice and subscription map
mainCtrl.c.registry.Initialize()
mainCtrl.c.registry.subIds = nil
// Initialize subIds slice and subscription map
mainCtrl.c.registry.Initialize()
+ restDuplicateCtrl.Init()
// Read subIds and subscriptions from database
subIds, register, err := mainCtrl.c.ReadAllSubscriptionsFromSdl()
if err != nil {
// Read subIds and subscriptions from database
subIds, register, err := mainCtrl.c.ReadAllSubscriptionsFromSdl()
if err != nil {
@@
-95,8
+98,15
@@
func (mc *testingSubmgrControl) SimulateRestart(t *testing.T) {
go mainCtrl.c.HandleUncompletedSubscriptions(mainCtrl.c.registry.register)
}
go mainCtrl.c.HandleUncompletedSubscriptions(mainCtrl.c.registry.register)
}
+func (mc *testingSubmgrControl) MakeTransactionNil(t *testing.T, subId uint32) {
+
+ mc.TestLog(t, "Makin transaction nil for SubId=%v", subId)
+ subs := mainCtrl.c.registry.GetSubscription(subId)
+ subs.TheTrans = nil
+}
+
func (mc *testingSubmgrControl) SetResetTestFlag(t *testing.T, status bool) {
func (mc *testingSubmgrControl) SetResetTestFlag(t *testing.T, status bool) {
- mc.TestLog(t, "ResetTestFlag set to %v
=
", status)
+ mc.TestLog(t, "ResetTestFlag set to %v", status)
mainCtrl.c.ResetTestFlag = status
}
mainCtrl.c.ResetTestFlag = status
}
@@
-120,12
+130,12
@@
func PringSubscriptionQueryResult(resp models.SubscriptionList) {
func (mc *testingSubmgrControl) wait_registry_empty(t *testing.T, secs int) bool {
cnt := int(0)
i := 1
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
}
cnt = len(mc.c.registry.register)
if cnt == 0 {
return true
}
- time.Sleep(
5
00 * time.Millisecond)
+ time.Sleep(
1
00 * time.Millisecond)
}
mc.TestError(t, "(submgr) no registry empty within %d secs: %d", secs, cnt)
return false
}
mc.TestError(t, "(submgr) no registry empty within %d secs: %d", secs, cnt)
return false
@@
-139,14
+149,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
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
}
mc.c.registry.mutex.Lock()
currSubId := mc.c.registry.subIds[0]
mc.c.registry.mutex.Unlock()
if currSubId != origSubId {
return currSubId, true
}
- time.Sleep(
5
00 * time.Millisecond)
+ time.Sleep(
1
00 * time.Millisecond)
}
mc.TestError(t, "(submgr) no subId change within %d secs", secs)
return 0, false
}
mc.TestError(t, "(submgr) no subId change within %d secs", secs)
return 0, false
@@
-155,12
+165,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
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
}
subs = mc.c.registry.GetSubscription(e2SubsId)
if subs == nil {
return true
}
- time.Sleep(
5
00 * time.Millisecond)
+ time.Sleep(
1
00 * time.Millisecond)
}
if subs != nil {
mc.TestError(t, "(submgr) no clean within %d secs: %s", secs, subs.String())
}
if subs != nil {
mc.TestError(t, "(submgr) no clean within %d secs: %s", secs, subs.String())
@@
-171,27
+181,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 {
}
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
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
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))
}
mc.TestError(t, "(submgr) no clean within %d secs: subs(N/A) - %v/%v subscriptions found still", secs, purgedSubscriptions, len(e2SubsIds))
@@
-202,7
+208,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
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
subs := mc.c.registry.GetSubscription(e2SubsId)
if subs == nil {
return true
@@
-211,7
+217,7
@@
func (mc *testingSubmgrControl) wait_subs_trans_clean(t *testing.T, e2SubsId uin
if trans == nil {
return true
}
if trans == nil {
return true
}
- time.Sleep(
5
00 * time.Millisecond)
+ time.Sleep(
1
00 * time.Millisecond)
}
if trans != nil {
mc.TestError(t, "(submgr) no clean within %d secs: %s", secs, trans.String())
}
if trans != nil {
mc.TestError(t, "(submgr) no clean within %d secs: %s", secs, trans.String())
@@
-239,12
+245,12
@@
func (mc *testingSubmgrControl) wait_subs_entrypoint_cnt_change(t *testing.T, or
}
i := 1
}
i := 1
- for ; i <= secs*
2
; i++ {
+ for ; i <= secs*
10
; i++ {
curr := subs.EpList.Size()
if curr != orig {
return curr, true
}
curr := subs.EpList.Size()
if curr != orig {
return curr, true
}
- time.Sleep(
5
00 * time.Millisecond)
+ time.Sleep(
1
00 * time.Millisecond)
}
mc.TestError(t, "(submgr) no subs %d entrypoint cnt change within %d secs", origSubId, secs)
return 0, false
}
mc.TestError(t, "(submgr) no subs %d entrypoint cnt change within %d secs", origSubId, secs)
return 0, false
@@
-259,12
+265,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
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
}
curr := mc.c.CntRecvMsg
if curr != orig {
return curr, true
}
- time.Sleep(
5
00 * time.Millisecond)
+ time.Sleep(
1
00 * time.Millisecond)
}
mc.TestError(t, "(submgr) no msg counter change within %d secs", secs)
return 0, false
}
mc.TestError(t, "(submgr) no msg counter change within %d secs", secs)
return 0, false