Merge pull request #359 from rsmp-nordic/yellow_flash_timeout_config

yellow flash timeout config
rsmp-nordic · Dec 13, 2023 · 1df95a6 · 1df95a6
2 parents add0e48 + 3ce83ab
commit 1df95a6
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 2 deletions.
diff --git a/config/dynniq_ec2.yaml b/config/dynniq_ec2.yaml
@@ -18,6 +18,7 @@ timeouts:
   shutdown: 180
   startup_sequence: 60
   functional_position: 30
+  yellow_flash: 60
 components:
   main:
     KK+AG9998=001TC000:

diff --git a/config/gem_tlc.yaml b/config/gem_tlc.yaml
@@ -20,6 +20,7 @@ timeouts:
   startup_sequence: 5
   functional_position: 2
   priority_completion: 5
+  yellow_flash: 2
 components:
   main:
     TC:

diff --git a/config/swarco_itc2.yaml b/config/swarco_itc2.yaml
@@ -20,6 +20,7 @@ timeouts:
   shutdown: 180
   startup_sequence: 180
   functional_position: 240
+  yellow_flash: 60
 components:
   main:
     KK+AG9998=001TC000:

diff --git a/config/swarco_itc3.yaml b/config/swarco_itc3.yaml
@@ -18,6 +18,7 @@ timeouts:
   shutdown: 180
   startup_sequence: 180
   functional_position: 30
+  yellow_flash: 60
 components:
   main:
     KK+AG9998=001TC000:

diff --git a/spec/site/tlc/modes_spec.rb b/spec/site/tlc/modes_spec.rb
@@ -179,7 +179,7 @@
     specify 'yellow flash affects all signal groups', sxl: '>=1.0.7' do |example|
       Validator::Site.connected do |task,supervisor,site|
         prepare task, site
-        timeout =  10
+        timeout =  Validator.config['timeouts']['yellow_flash']
 
         switch_yellow_flash
         wait_for_groups 'c', timeout: timeout      # c mean s yellow flash

diff --git a/spec/support/status_helpers.rb b/spec/support/status_helpers.rb
@@ -66,7 +66,6 @@ def wait_for_status parent_task, description, status_list,
   end
 
   def wait_for_groups state, timeout:
-    timeout = 10
     regex = /^#{state}+$/
     wait_for_status(@task,
       "Wait for all groups to go to yellow flash",