7
7
import logging
8
8
9
9
import pytest
10
- import re
11
10
12
11
from tests .common .fixtures .conn_graph_facts import conn_graph_facts # noqa F401
13
12
from tests .common .utilities import wait_until
@@ -125,9 +124,6 @@ def test_reload_configuration_checks(duthosts, enum_rand_one_per_hwsku_hostname,
125
124
# we must give it a little longer or else it may falsely fail the test.
126
125
wait_until (360 , 1 , 0 , check_database_status , duthost )
127
126
128
- # Check if interfaces-config.service is exited
129
- wait_until (60 , 1 , 0 , check_interfaces_config_service_status , duthost )
130
-
131
127
logging .info ("Reload configuration check" )
132
128
out = duthost .shell ("sudo config reload -y" ,
133
129
executable = "/bin/bash" , module_ignore_errors = True )
@@ -145,8 +141,6 @@ def test_reload_configuration_checks(duthosts, enum_rand_one_per_hwsku_hostname,
145
141
logging .info ("Checking config reload after system is up" )
146
142
# Check if all database containers have started
147
143
wait_until (60 , 1 , 0 , check_database_status , duthost )
148
- # Check if interfaces-config.service is exited
149
- wait_until (60 , 1 , 0 , check_interfaces_config_service_status , duthost )
150
144
out = duthost .shell ("sudo config reload -y" ,
151
145
executable = "/bin/bash" , module_ignore_errors = True )
152
146
assert "Retry later" in out ['stdout' ]
@@ -170,11 +164,3 @@ def test_reload_configuration_checks(duthosts, enum_rand_one_per_hwsku_hostname,
170
164
assert "Retry later" not in out ['stdout' ]
171
165
172
166
assert wait_until (300 , 20 , 0 , config_system_checks_passed , duthost , delayed_services )
173
-
174
-
175
- def check_interfaces_config_service_status (duthost ):
176
- # check interfaces-config.service status
177
- regx_interface_config_service_exit = r'.*Main PID: \d+ \(code=exited, status=0\/SUCCESS\).*'
178
- interface_config_server_status = duthost .command (
179
- 'systemctl status interfaces-config.service' , module_ignore_errors = True )['stdout' ]
180
- return re .search (regx_interface_config_service_exit , interface_config_server_status )
0 commit comments