From f8ee84c22b8aca93a25c8e98319092e31221615c Mon Sep 17 00:00:00 2001
From: Vadim Yanitskiy <vyanitskiy@sysmocom.de>
Date: Tue, 5 Sep 2023 14:56:22 +0700
Subject: Revert "BTS_Tests: execute TC_dyn_osmo_pdch_{tchh,sdcch8}_race_act
 last"

This reverts commit 46f199271ef77a5143d95894801eb0c86c51a565.

Crashing the IUT is no longer the case, so return these back.

Change-Id: I004b55a79a04a20209d8a91e1f307f55c2b6ea13
---
 bts/BTS_Tests.ttcn       | 7 ++-----
 bts/expected-results.xml | 4 ++--
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn
index 3fe6120a..df18403d 100644
--- a/bts/BTS_Tests.ttcn
+++ b/bts/BTS_Tests.ttcn
@@ -9335,6 +9335,8 @@ control {
 	execute( TC_dyn_osmo_pdch_tchf_act() );
 	execute( TC_dyn_osmo_pdch_tchh_act() );
 	execute( TC_dyn_osmo_pdch_sdcch8_act() );
+	execute( TC_dyn_osmo_pdch_tchh_race_act() );
+	execute( TC_dyn_osmo_pdch_sdcch8_race_act() );
 	execute( TC_dyn_ipa_pdch_tchf_act() );
 	execute( TC_dyn_ipa_pdch_tchf_act_pdch_act_nack() );
 
@@ -9396,11 +9398,6 @@ control {
 	execute( TC_acch_overpower_always_on_facch() );
 	execute( TC_acch_overpower_always_on_sacch() );
 	execute( TC_acch_overpower_limit() );
-
-	/* BEWARE: these test cases can potentially break the IUT or cause
-	 * weird/unexpected behavior.  Ensure that they are executed last. */
-	execute( TC_dyn_osmo_pdch_tchh_race_act() );
-	execute( TC_dyn_osmo_pdch_sdcch8_race_act() );
 }
 
 
diff --git a/bts/expected-results.xml b/bts/expected-results.xml
index 61c0b605..a856fca2 100644
--- a/bts/expected-results.xml
+++ b/bts/expected-results.xml
@@ -137,6 +137,8 @@
   <testcase classname='BTS_Tests' name='TC_dyn_osmo_pdch_tchf_act' time='MASKED'/>
   <testcase classname='BTS_Tests' name='TC_dyn_osmo_pdch_tchh_act' time='MASKED'/>
   <testcase classname='BTS_Tests' name='TC_dyn_osmo_pdch_sdcch8_act' time='MASKED'/>
+  <testcase classname='BTS_Tests' name='TC_dyn_osmo_pdch_tchh_race_act' time='MASKED'/>
+  <testcase classname='BTS_Tests' name='TC_dyn_osmo_pdch_sdcch8_race_act' time='MASKED'/>
   <testcase classname='BTS_Tests' name='TC_dyn_ipa_pdch_tchf_act' time='MASKED'/>
   <testcase classname='BTS_Tests' name='TC_dyn_ipa_pdch_tchf_act_pdch_act_nack' time='MASKED'/>
   <testcase classname='BTS_Tests' name='TC_rll_est_ind' time='MASKED'/>
@@ -192,8 +194,6 @@
   <testcase classname='BTS_Tests' name='TC_acch_overpower_always_on_facch' time='MASKED'/>
   <testcase classname='BTS_Tests' name='TC_acch_overpower_always_on_sacch' time='MASKED'/>
   <testcase classname='BTS_Tests' name='TC_acch_overpower_limit' time='MASKED'/>
-  <testcase classname='BTS_Tests' name='TC_dyn_osmo_pdch_tchh_race_act' time='MASKED'/>
-  <testcase classname='BTS_Tests' name='TC_dyn_osmo_pdch_sdcch8_race_act' time='MASKED'/>
   <testcase classname='BTS_Tests_SMSCB' name='TC_cbch_load_idle_no_cbch' time='MASKED'/>
   <testcase classname='BTS_Tests_SMSCB' name='TC_sms_cb_cmd_sdcch4_1block' time='MASKED'/>
   <testcase classname='BTS_Tests_SMSCB' name='TC_sms_cb_cmd_sdcch4_2block' time='MASKED'/>
-- 
cgit v1.2.3