du-high: fix du-high unit test

Author: frankist

tests/integrationtests/du_high/du_high_test.cpp

@@ -158,12 +158,19 @@ TEST_F(du_high_tester, when_ue_context_setup_release_starts_then_drb_activity_st
   this->test_logger.info("STATUS: RRC Release started being scheduled...");
 
   // Ensure that DRBs stop being scheduled at this point, even if it takes a while for the UE release to complete.
+  unsigned drb_data_count = 0;
   while (cu_notifier.last_f1ap_msgs.empty()) {
     run_slot();
     const dl_msg_alloc* pdsch = find_ue_pdsch(rnti, phy.cells[0].last_dl_res.value().dl_res->ue_grants);
     if (pdsch != nullptr) {
-      // PDSCH scheduled. Ensure it was for SRB1 (DRB1 might fill the rest of the TB though).
-      ASSERT_NE(find_ue_pdsch_with_lcid(rnti, LCID_SRB1, phy.cells[0].last_dl_res.value().dl_res->ue_grants), nullptr);
+      // PDSCH scheduled. Ensure it was for SRB1.
+      // Note: There might be at most one single DRB1 PDSCH that smuggles in after the RRC Release due to race
+      // conditions.
+      auto* drb_pdsch = find_ue_pdsch_with_lcid(rnti, LCID_MIN_DRB, phy.cells[0].last_dl_res.value().dl_res->ue_grants);
+      if (drb_pdsch != nullptr) {
+        drb_data_count++;
+        ASSERT_LT(drb_data_count, 2) << "More than 1 PDSCH grant for DRB data was scheduled after RRC Release";
+      }
     }
   }
 }

tests/unittests/du_manager/du_ue/ue_manager_test.cpp

@@ -277,7 +277,7 @@ TEST_F(du_ue_manager_tester, when_ue_is_being_removed_then_ue_notifiers_get_disc
   // TEST: UE notifiers are disconnected.
   mac_dummy.last_dl_bs.reset();
   srb1.on_buffer_state_update(10);
-  ASSERT_FALSE(mac_dummy.last_dl_bs.has_value());
+  ASSERT_TRUE(not mac_dummy.last_dl_bs.has_value() or mac_dummy.last_dl_bs.value().bs == 0);
 }
 
 class du_ue_manager_rlf_tester : public du_ue_manager_tester