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
13
12
from tests .common .utilities import wait_until
@@ -94,9 +93,6 @@ def test_reload_configuration_checks(duthosts, enum_rand_one_per_hwsku_hostname,
94
93
# we must give it a little longer or else it may falsely fail the test.
95
94
wait_until (360 , 1 , 0 , check_database_status , duthost )
96
95
97
- # Check if interfaces-config.service is exited
98
- wait_until (60 , 1 , 0 , check_interfaces_config_service_status , duthost )
99
-
100
96
logging .info ("Reload configuration check" )
101
97
out = duthost .shell ("sudo config reload -y" , executable = "/bin/bash" , module_ignore_errors = True )
102
98
# config reload command shouldn't work immediately after system reboot
@@ -112,8 +108,6 @@ def test_reload_configuration_checks(duthosts, enum_rand_one_per_hwsku_hostname,
112
108
logging .info ("Checking config reload after system is up" )
113
109
# Check if all database containers have started
114
110
wait_until (60 , 1 , 0 , check_database_status , duthost )
115
- # Check if interfaces-config.service is exited
116
- wait_until (60 , 1 , 0 , check_interfaces_config_service_status , duthost )
117
111
out = duthost .shell ("sudo config reload -y" , executable = "/bin/bash" , module_ignore_errors = True )
118
112
assert "Retry later" in out ['stdout' ]
119
113
assert wait_until (300 , 20 , 0 , config_system_checks_passed , duthost )
@@ -135,11 +129,3 @@ def test_reload_configuration_checks(duthosts, enum_rand_one_per_hwsku_hostname,
135
129
assert "Retry later" not in out ['stdout' ]
136
130
137
131
assert wait_until (300 , 20 , 0 , config_system_checks_passed , duthost )
138
-
139
-
140
- def check_interfaces_config_service_status (duthost ):
141
- # check interfaces-config.service status
142
- regx_interface_config_service_exit = r'.*Main PID: \d+ \(code=exited, status=0\/SUCCESS\).*'
143
- interface_config_server_status = duthost .command (
144
- 'systemctl status interfaces-config.service' , module_ignore_errors = True )['stdout' ]
145
- return re .search (regx_interface_config_service_exit , interface_config_server_status )
0 commit comments