fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-06 02:18:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

test: fix errors in debug helper if a service isn't running

Browse source 
No point in complaining about modem-manager not running when
modem-manager isn't getting changed.
This commit is contained in:
Dan Williams 2011-12-19 21:04:54 -06:00
parent 5f15918817
commit 8f110f40b1
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
test/debug-helper.py
View file

@ -6,15 +6,6 @@ import argparse
bus = dbus.SystemBus() bus = dbus.SystemBus()
nm_bus = bus.get_object('org.freedesktop.NetworkManager', '/org/freedesktop/NetworkManager')
mm_bus = bus.get_object('org.freedesktop.ModemManager', '/org/freedesktop/ModemManager')
wpa_bus = bus.get_object('fi.w1.wpa_supplicant1', '/fi/w1/wpa_supplicant1')
nm = dbus.Interface(nm_bus, dbus_interface='org.freedesktop.NetworkManager')
mm = dbus.Interface(mm_bus, dbus_interface='org.freedesktop.ModemManager')
wpa = dbus.Interface(wpa_bus, dbus_interface='fi.w1.wpa_supplicant1')
wpa_properties = dbus.Interface(wpa_bus, dbus_interface='org.freedesktop.DBus.Properties')
parser = argparse.ArgumentParser(description='Interface to easily control logging levels for NetworkManager, ModemManager, and wpasupplicant.') parser = argparse.ArgumentParser(description='Interface to easily control logging levels for NetworkManager, ModemManager, and wpasupplicant.')
# NM options # NM options
@ -40,10 +31,16 @@ if args.do_set_nm_logging:
if args.log_domains: if args.log_domains:
dom_msg = " for domains: " + ','.join(args.log_domains) dom_msg = " for domains: " + ','.join(args.log_domains)
print "Setting NetworkManager log level to '" + args.do_set_nm_logging + "'" + dom_msg print "Setting NetworkManager log level to '" + args.do_set_nm_logging + "'" + dom_msg
nm_bus = bus.get_object('org.freedesktop.NetworkManager', '/org/freedesktop/NetworkManager')
nm = dbus.Interface(nm_bus, dbus_interface='org.freedesktop.NetworkManager')
nm.SetLogging(args.do_set_nm_logging, ','.join(args.log_domains)) nm.SetLogging(args.do_set_nm_logging, ','.join(args.log_domains))
if args.do_set_mm_logging: if args.do_set_mm_logging:
print "Setting ModemManager log level to '" + args.do_set_mm_logging + "'" print "Setting ModemManager log level to '" + args.do_set_mm_logging + "'"
mm_bus = bus.get_object('org.freedesktop.ModemManager', '/org/freedesktop/ModemManager')
mm = dbus.Interface(mm_bus, dbus_interface='org.freedesktop.ModemManager')
mm.SetLogging(args.do_set_mm_logging) mm.SetLogging(args.do_set_mm_logging)
if args.do_set_wpa_logging: if args.do_set_wpa_logging:
@ -56,6 +53,8 @@ if args.do_set_wpa_logging:
print "Disabling timestamps for wpasupplicant debugging logs" print "Disabling timestamps for wpasupplicant debugging logs"
use_timestamps = dbus.Boolean(False, variant_level=1) use_timestamps = dbus.Boolean(False, variant_level=1)
wpa_bus = bus.get_object('fi.w1.wpa_supplicant1', '/fi/w1/wpa_supplicant1')
wpa_properties = dbus.Interface(wpa_bus, dbus_interface='org.freedesktop.DBus.Properties')
wpa_properties.Set('fi.w1.wpa_supplicant1', 'DebugTimestamp', use_timestamps) wpa_properties.Set('fi.w1.wpa_supplicant1', 'DebugTimestamp', use_timestamps)
wpa_properties.Set('fi.w1.wpa_supplicant1', 'DebugLevel', wpa_properties.Set('fi.w1.wpa_supplicant1', 'DebugLevel',
dbus.String(args.do_set_wpa_logging, variant_level=1)) dbus.String(args.do_set_wpa_logging, variant_level=1))