diff options
Diffstat (limited to 'tests')
-rw-r--r-- | tests/ulc/PdchUlcTest.cpp | 4 | ||||
-rw-r--r-- | tests/ulc/PdchUlcTest.err | 54 | ||||
-rw-r--r-- | tests/ulc/PdchUlcTest.ok | 62 |
3 files changed, 72 insertions, 48 deletions
diff --git a/tests/ulc/PdchUlcTest.cpp b/tests/ulc/PdchUlcTest.cpp index 320a7bff..00991012 100644 --- a/tests/ulc/PdchUlcTest.cpp +++ b/tests/ulc/PdchUlcTest.cpp @@ -199,14 +199,14 @@ static void test_fn_wrap_around() printf("*** RELEASE fn=%" PRIu32 ":\n", 0); rc = pdch_ulc_release_fn(pdch->ulc, 0); print_ulc_nodes(pdch->ulc); - //OSMO_ASSERT(rc == 0); FIXME: DISABLED DUE TO BUG! + OSMO_ASSERT(rc == 0); /* Expiring last FN should expire all entries */ printf("*** EXPIRE FN=%" PRIu32 ":\n", last_fn); pdch_ulc_expire_fn(pdch->ulc, last_fn); print_ulc_nodes(pdch->ulc); /* Make sure the store is empty now: */ - //OSMO_ASSERT(!rb_first(&pdch->ulc->tree_root)); FIXME: DISABLED DUE TO BUG! + OSMO_ASSERT(!rb_first(&pdch->ulc->tree_root)); talloc_free(bts); printf("=== end: %s ===\n", __FUNCTION__); diff --git a/tests/ulc/PdchUlcTest.err b/tests/ulc/PdchUlcTest.err index 88e46445..34a090b8 100644 --- a/tests/ulc/PdchUlcTest.err +++ b/tests/ulc/PdchUlcTest.err @@ -6,26 +6,38 @@ PDCH(bts=0,trx=0,ts=0) Trying to release unregistered SBA (FN=78, TA=0) PDCH(bts=0,trx=0,ts=0) Timeout for registered SBA (FN=72, TA=0) Creating MS object, TLLI = 0x12345678 MS(TLLI=0x12345678, IMSI=, TA=220, 0/0,) Attaching DL TBF: TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NULL) -PDCH(bts=0,trx=0,ts=0) Expiring FN=2715613 but previous FN=0 is still reserved! -PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=0): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NULL) -PDCH(bts=0,trx=0,ts=0) Expiring FN=2715613 but previous FN=4 is still reserved! -PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=4): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NULL) -PDCH(bts=0,trx=0,ts=0) Expiring FN=2715613 but previous FN=8 is still reserved! -PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=8): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NULL) -PDCH(bts=0,trx=0,ts=0) Expiring FN=2715613 but previous FN=13 is still reserved! -PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=13): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NULL) -PDCH(bts=0,trx=0,ts=0) Expiring FN=2715613 but previous FN=17 is still reserved! -PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=17): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NULL) -PDCH(bts=0,trx=0,ts=0) Expiring FN=2715613 but previous FN=21 is still reserved! -PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=21): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NULL) -PDCH(bts=0,trx=0,ts=0) Expiring FN=2715613 but previous FN=26 is still reserved! -PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=26): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NULL) -PDCH(bts=0,trx=0,ts=0) Expiring FN=2715613 but previous FN=30 is still reserved! -PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=30): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NULL) -PDCH(bts=0,trx=0,ts=0) Expiring FN=2715613 but previous FN=34 is still reserved! +PDCH(bts=0,trx=0,ts=0) Expiring FN=2715613 but previous FN=2715608 is still reserved! +PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=2715608): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NULL) +PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=2715613): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NULL) +PDCH(bts=0,trx=0,ts=0) Expiring FN=43 but previous FN=2715617 is still reserved! +PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=2715617): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NULL) +PDCH(bts=0,trx=0,ts=0) Expiring FN=43 but previous FN=2715622 is still reserved! +PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=2715622): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NULL) +PDCH(bts=0,trx=0,ts=0) Expiring FN=43 but previous FN=2715626 is still reserved! +PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=2715626): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NULL) +PDCH(bts=0,trx=0,ts=0) Expiring FN=43 but previous FN=2715630 is still reserved! +PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=2715630): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NULL) +PDCH(bts=0,trx=0,ts=0) Expiring FN=43 but previous FN=2715635 is still reserved! +PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=2715635): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NULL) +PDCH(bts=0,trx=0,ts=0) Expiring FN=43 but previous FN=2715639 is still reserved! +PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=2715639): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NULL) +PDCH(bts=0,trx=0,ts=0) Expiring FN=43 but previous FN=2715643 is still reserved! +PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=2715643): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=RELEASING) +PDCH(bts=0,trx=0,ts=0) Expiring FN=43 but previous FN=4 is still reserved! +PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=4): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=RELEASING) +PDCH(bts=0,trx=0,ts=0) Expiring FN=43 but previous FN=8 is still reserved! +PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=8): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=RELEASING) +PDCH(bts=0,trx=0,ts=0) Expiring FN=43 but previous FN=13 is still reserved! +PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=13): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=RELEASING) +PDCH(bts=0,trx=0,ts=0) Expiring FN=43 but previous FN=17 is still reserved! +PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=17): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=RELEASING) +PDCH(bts=0,trx=0,ts=0) Expiring FN=43 but previous FN=21 is still reserved! +PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=21): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=RELEASING) +PDCH(bts=0,trx=0,ts=0) Expiring FN=43 but previous FN=26 is still reserved! +PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=26): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=RELEASING) +PDCH(bts=0,trx=0,ts=0) Expiring FN=43 but previous FN=30 is still reserved! +PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=30): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=RELEASING) +PDCH(bts=0,trx=0,ts=0) Expiring FN=43 but previous FN=34 is still reserved! PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=34): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=RELEASING) -PDCH(bts=0,trx=0,ts=0) Expiring FN=2715613 but previous FN=39 is still reserved! +PDCH(bts=0,trx=0,ts=0) Expiring FN=43 but previous FN=39 is still reserved! PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=39): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=RELEASING) -PDCH(bts=0,trx=0,ts=0) Expiring FN=2715613 but previous FN=2715608 is still reserved! -PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=2715608): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=RELEASING) -PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=2715613): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=RELEASING) diff --git a/tests/ulc/PdchUlcTest.ok b/tests/ulc/PdchUlcTest.ok index 7c17f01a..f20fb309 100644 --- a/tests/ulc/PdchUlcTest.ok +++ b/tests/ulc/PdchUlcTest.ok @@ -56,7 +56,6 @@ FN=2715635 type=POLL FN=2715639 type=POLL FN=2715643 type=POLL *** RESERVE FN=0: -FN=0 type=POLL FN=2715608 type=POLL FN=2715613 type=POLL FN=2715617 type=POLL @@ -66,9 +65,20 @@ FN=2715630 type=POLL FN=2715635 type=POLL FN=2715639 type=POLL FN=2715643 type=POLL +FN=0 type=POLL *** RESERVE FN=4: +FN=2715608 type=POLL +FN=2715613 type=POLL +FN=2715617 type=POLL +FN=2715622 type=POLL +FN=2715626 type=POLL +FN=2715630 type=POLL +FN=2715635 type=POLL +FN=2715639 type=POLL +FN=2715643 type=POLL FN=0 type=POLL FN=4 type=POLL +*** RESERVE FN=8: FN=2715608 type=POLL FN=2715613 type=POLL FN=2715617 type=POLL @@ -78,10 +88,10 @@ FN=2715630 type=POLL FN=2715635 type=POLL FN=2715639 type=POLL FN=2715643 type=POLL -*** RESERVE FN=8: FN=0 type=POLL FN=4 type=POLL FN=8 type=POLL +*** RESERVE FN=13: FN=2715608 type=POLL FN=2715613 type=POLL FN=2715617 type=POLL @@ -91,11 +101,11 @@ FN=2715630 type=POLL FN=2715635 type=POLL FN=2715639 type=POLL FN=2715643 type=POLL -*** RESERVE FN=13: FN=0 type=POLL FN=4 type=POLL FN=8 type=POLL FN=13 type=POLL +*** RESERVE FN=17: FN=2715608 type=POLL FN=2715613 type=POLL FN=2715617 type=POLL @@ -105,12 +115,12 @@ FN=2715630 type=POLL FN=2715635 type=POLL FN=2715639 type=POLL FN=2715643 type=POLL -*** RESERVE FN=17: FN=0 type=POLL FN=4 type=POLL FN=8 type=POLL FN=13 type=POLL FN=17 type=POLL +*** RESERVE FN=21: FN=2715608 type=POLL FN=2715613 type=POLL FN=2715617 type=POLL @@ -120,13 +130,13 @@ FN=2715630 type=POLL FN=2715635 type=POLL FN=2715639 type=POLL FN=2715643 type=POLL -*** RESERVE FN=21: FN=0 type=POLL FN=4 type=POLL FN=8 type=POLL FN=13 type=POLL FN=17 type=POLL FN=21 type=POLL +*** RESERVE FN=26: FN=2715608 type=POLL FN=2715613 type=POLL FN=2715617 type=POLL @@ -136,7 +146,6 @@ FN=2715630 type=POLL FN=2715635 type=POLL FN=2715639 type=POLL FN=2715643 type=POLL -*** RESERVE FN=26: FN=0 type=POLL FN=4 type=POLL FN=8 type=POLL @@ -144,6 +153,7 @@ FN=13 type=POLL FN=17 type=POLL FN=21 type=POLL FN=26 type=POLL +*** RESERVE FN=30: FN=2715608 type=POLL FN=2715613 type=POLL FN=2715617 type=POLL @@ -153,7 +163,6 @@ FN=2715630 type=POLL FN=2715635 type=POLL FN=2715639 type=POLL FN=2715643 type=POLL -*** RESERVE FN=30: FN=0 type=POLL FN=4 type=POLL FN=8 type=POLL @@ -162,6 +171,7 @@ FN=17 type=POLL FN=21 type=POLL FN=26 type=POLL FN=30 type=POLL +*** RESERVE FN=34: FN=2715608 type=POLL FN=2715613 type=POLL FN=2715617 type=POLL @@ -171,7 +181,6 @@ FN=2715630 type=POLL FN=2715635 type=POLL FN=2715639 type=POLL FN=2715643 type=POLL -*** RESERVE FN=34: FN=0 type=POLL FN=4 type=POLL FN=8 type=POLL @@ -181,6 +190,7 @@ FN=21 type=POLL FN=26 type=POLL FN=30 type=POLL FN=34 type=POLL +*** RESERVE FN=39: FN=2715608 type=POLL FN=2715613 type=POLL FN=2715617 type=POLL @@ -190,7 +200,6 @@ FN=2715630 type=POLL FN=2715635 type=POLL FN=2715639 type=POLL FN=2715643 type=POLL -*** RESERVE FN=39: FN=0 type=POLL FN=4 type=POLL FN=8 type=POLL @@ -201,15 +210,6 @@ FN=26 type=POLL FN=30 type=POLL FN=34 type=POLL FN=39 type=POLL -FN=2715608 type=POLL -FN=2715613 type=POLL -FN=2715617 type=POLL -FN=2715622 type=POLL -FN=2715626 type=POLL -FN=2715630 type=POLL -FN=2715635 type=POLL -FN=2715639 type=POLL -FN=2715643 type=POLL *** EXPIRE FN=2715613: FN=2715617 type=POLL FN=2715622 type=POLL @@ -218,6 +218,16 @@ FN=2715630 type=POLL FN=2715635 type=POLL FN=2715639 type=POLL FN=2715643 type=POLL +FN=0 type=POLL +FN=4 type=POLL +FN=8 type=POLL +FN=13 type=POLL +FN=17 type=POLL +FN=21 type=POLL +FN=26 type=POLL +FN=30 type=POLL +FN=34 type=POLL +FN=39 type=POLL *** RELEASE fn=0: FN=2715617 type=POLL FN=2715622 type=POLL @@ -226,12 +236,14 @@ FN=2715630 type=POLL FN=2715635 type=POLL FN=2715639 type=POLL FN=2715643 type=POLL +FN=4 type=POLL +FN=8 type=POLL +FN=13 type=POLL +FN=17 type=POLL +FN=21 type=POLL +FN=26 type=POLL +FN=30 type=POLL +FN=34 type=POLL +FN=39 type=POLL *** EXPIRE FN=43: -FN=2715617 type=POLL -FN=2715622 type=POLL -FN=2715626 type=POLL -FN=2715630 type=POLL -FN=2715635 type=POLL -FN=2715639 type=POLL -FN=2715643 type=POLL === end: test_fn_wrap_around === |