test: Remove redundant code from monitor-ofono

diff --git a/test/monitor-ofono b/test/monitor-ofono
index dcc5ff5..4ed3f2a 100755 (executable)
--- 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")