From 8f2237dd78815ae1b3b4fb9f5802885c3bac99e9 Mon Sep 17 00:00:00 2001 From: Denis Kenzior Date: Tue, 7 Aug 2012 01:26:57 -0500 Subject: test: Remove redundant code from monitor-ofono --- test/monitor-ofono | 56 ++++++++++++------------------------------------------ 1 file changed, 12 insertions(+), 44 deletions(-) (limited to 'test') diff --git a/test/monitor-ofono b/test/monitor-ofono index dcc5ff5b..4ed3f2ad 100755 --- a/test/monitor-ofono +++ b/test/monitor-ofono @@ -100,56 +100,24 @@ if __name__ == '__main__': path_keyword="path", interface_keyword="interface") - bus.add_signal_receiver(added, + for member in ["ModemAdded", + "ContextAdded", + "CallAdded", + "MessageAdded"]: + bus.add_signal_receiver(added, bus_name="org.ofono", - signal_name = "ModemAdded", - member_keyword="member", - path_keyword="path", - interface_keyword="interface") - - bus.add_signal_receiver(removed, - bus_name="org.ofono", - signal_name = "ModemRemoved", - member_keyword="member", - path_keyword="path", - interface_keyword="interface") - - bus.add_signal_receiver(added, - bus_name="org.ofono", - signal_name = "ContextAdded", + signal_name = member, member_keyword="member", path_keyword="path", interface_keyword="interface") - bus.add_signal_receiver(removed, + for member in ["ModemRemoved", + "ContextRemoved", + "CallRemoved", + "MessageRemoved"]: + bus.add_signal_receiver(removed, bus_name="org.ofono", - signal_name = "ContextRemoved", - member_keyword="member", - path_keyword="path", - interface_keyword="interface") - - bus.add_signal_receiver(added, - bus_name="org.ofono", - signal_name = "CallAdded", - member_keyword="member", - path_keyword="path", - interface_keyword="interface") - bus.add_signal_receiver(removed, - bus_name="org.ofono", - signal_name = "CallRemoved", - member_keyword="member", - path_keyword="path", - interface_keyword="interface") - - bus.add_signal_receiver(added, - bus_name="org.ofono", - signal_name = "MessageAdded", - member_keyword="member", - path_keyword="path", - interface_keyword="interface") - bus.add_signal_receiver(removed, - bus_name="org.ofono", - signal_name = "MessageRemoved", + signal_name = member, member_keyword="member", path_keyword="path", interface_keyword="interface") -- cgit v1.2.3