Commit e4d61153 authored by Filip Pokryvka's avatar Filip Pokryvka 🤸🏻
Browse files

environment: unify dump_status_{nmcli,nmtui}

It makes no sense to have this different anymore. `nmcli` missed wifi 
list, should not cause much harm by adding it.
parent e5458565
...@@ -78,13 +78,15 @@ def _before_scenario(context, scenario): ...@@ -78,13 +78,15 @@ def _before_scenario(context, scenario):
os.environ['TERM'] = 'dumb' os.environ['TERM'] = 'dumb'
# dump status before the test preparation starts
nmci.lib.dump_status(context, 'Before Scenario', fail_only=True)
if context.IS_NMTUI: if context.IS_NMTUI:
nmci.run("sudo pkill nmtui") nmci.run("sudo pkill nmtui")
# Do the cleanup # Do the cleanup
if os.path.isfile('/tmp/tui-screen.log'): if os.path.isfile('/tmp/tui-screen.log'):
os.remove('/tmp/tui-screen.log') os.remove('/tmp/tui-screen.log')
fd = open('/tmp/tui-screen.log', 'a+') fd = open('/tmp/tui-screen.log', 'a+')
nmci.lib.dump_status_nmtui(context, 'before', fail_only=True)
fd.write('Screen recordings after each step:' + '\n----------------------------------\n') fd.write('Screen recordings after each step:' + '\n----------------------------------\n')
fd.flush() fd.flush()
fd.close() fd.close()
...@@ -98,8 +100,6 @@ def _before_scenario(context, scenario): ...@@ -98,8 +100,6 @@ def _before_scenario(context, scenario):
if nmci.command_code("nmcli device |grep testeth0 |grep ' connected'") == 0: if nmci.command_code("nmcli device |grep testeth0 |grep ' connected'") == 0:
break break
time.sleep(1) time.sleep(1)
# dump status before the test preparation starts
nmci.lib.dump_status_nmcli(context, 'Before Scenario', fail_only=True)
context.start_timestamp = int(time.time()) context.start_timestamp = int(time.time())
excepts = [] excepts = []
...@@ -240,7 +240,7 @@ def _after_scenario(context, scenario): ...@@ -240,7 +240,7 @@ def _after_scenario(context, scenario):
print(("NetworkManager process id after: %s (was %s)" % (nm_pid_after, context.nm_pid))) print(("NetworkManager process id after: %s (was %s)" % (nm_pid_after, context.nm_pid)))
if scenario.status == 'failed' or DEBUG: if scenario.status == 'failed' or DEBUG:
nmci.lib.dump_status_nmcli(context, 'After Scenario', fail_only=True) nmci.lib.dump_status(context, 'After Scenario', fail_only=True)
# run after_scenario tags (in reverse order) # run after_scenario tags (in reverse order)
excepts = [] excepts = []
...@@ -272,7 +272,7 @@ def _after_scenario(context, scenario): ...@@ -272,7 +272,7 @@ def _after_scenario(context, scenario):
# !!! all embed calls with "fail_only" after this are ignored !!! # !!! all embed calls with "fail_only" after this are ignored !!!
nmci.lib.process_embeds(context, scenario_fail) nmci.lib.process_embeds(context, scenario_fail)
nmci.lib.dump_status_nmcli(context, 'After Clean', fail_only=False) nmci.lib.dump_status(context, 'After Clean', fail_only=False)
if scenario_fail: if scenario_fail:
# Attach journalctl logs # Attach journalctl logs
......
...@@ -294,25 +294,7 @@ def stripped(x): ...@@ -294,25 +294,7 @@ def stripped(x):
return "".join([i for i in x if 31 < ord(i) < 127]) return "".join([i for i in x if 31 < ord(i) < 127])
def dump_status_nmtui(context, when, fail_only=False): def dump_status(context, when, fail_only=False):
msg = ""
cmds = ['date "+%Y%m%d-%H%M%S.%N"',
'ip link',
'ip addr',
'ip -4 route',
'ip -6 route',
'nmcli g',
'nmcli c',
'nmcli d',
'nmcli d w l']
for cmd in cmds:
msg += "\n--- %s ---\n" % cmd
cmd_out, _, _ = nmci.run(cmd)
msg += cmd_out
context.embed("text/plain", msg, "Status " + when, fail_only=fail_only)
def dump_status_nmcli(context, when, fail_only=False):
nm_running = nmci.command_code('systemctl status NetworkManager') == 0 nm_running = nmci.command_code('systemctl status NetworkManager') == 0
msg = "" msg = ""
cmds = ['date "+%Y%m%d-%H%M%S.%N"'] cmds = ['date "+%Y%m%d-%H%M%S.%N"']
...@@ -325,6 +307,7 @@ def dump_status_nmcli(context, when, fail_only=False): ...@@ -325,6 +307,7 @@ def dump_status_nmcli(context, when, fail_only=False):
cmds += ['nmcli g', cmds += ['nmcli g',
'nmcli c', 'nmcli c',
'nmcli d', 'nmcli d',
'nmcli d w l',
'hostnamectl', 'hostnamectl',
'NetworkManager --print-config', 'NetworkManager --print-config',
'cat /etc/resolv.conf', 'cat /etc/resolv.conf',
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment