shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-09 12:58:26 +03:00
Code

test-network: check existence before calling networkctl or ip command

Browse Source
This commit is contained in:
Yu Watanabe 2022-02-24 16:24:49 +09:00
parent 3c39b9cf37
commit 459c35d4c5
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
test/test-network/systemd-networkd-tests.py
View File

@ -609,11 +609,13 @@ class Utilities():
needle = f'{link}: Bringing link {state}'
flag = state.upper()
for iteration in range(timeout+1):
if iteration != 0:
time.sleep(1)
if not link_exists(link):
continue
output = check_output('journalctl _SYSTEMD_INVOCATION_ID=' + invocation_id)
if needle in output and flag in check_output(f'ip link show {link}'):
return True
if iteration < timeout:
time.sleep(1)
if fail_assert:
self.fail(f'Timed out waiting for {link} activated.')
return False
@ -638,13 +640,14 @@ class Utilities():
setup_state = r'\S+'
for secs in range(setup_timeout + 1):
if secs != 0:
time.sleep(1)
if not link_exists(link):
continue
output = check_output(*networkctl_cmd, '-n', '0', 'status', link, env=env)
print(output)
if re.search(rf'(?m)^\s*State:\s+{operstate}\s+\({setup_state}\)\s*$', output):
return True
# don't bother sleeping if time is up
if secs < setup_timeout:
time.sleep(1)
if fail_assert:
self.fail(f'Timed out waiting for {link} to reach state {operstate}/{setup_state}')
return False