Merge "wireguard: Add routes for allowedIPs" into tizen

[platform/upstream/connman.git] / test / test-counter

diff --git a/test/test-counter b/test/test-counter
index 2cdee34..c09aabc 100755 (executable)
--- a/test/test-counter
+++ b/test/test-counter
@@ -24,49 +24,54 @@ def make_bytes_readable(bytes):
        return ''
 
 def print_stats(stats):
-       keys = stats.keys()
+       keys = list(stats.keys())
        keys.sort()
 
        for key in keys:
                val = int(stats[key])
-               str = "  %s = %s" % (key, val)
+               str = "    %s = %s" % (key, val)
 
                if key in ["RX.Bytes", "TX.Bytes"]:
                        hstr = make_bytes_readable(val)
                        if hstr:
                                str = "%s (%s)" % (str, hstr)
 
-               print str
+               print(str)
 
 class Counter(dbus.service.Object):
-       @dbus.service.method("org.moblin.connman.Counter",
+       @dbus.service.method("net.connman.Counter",
                                in_signature='', out_signature='')
        def Release(self):
                print("Release")
                mainloop.quit()
 
-       @dbus.service.method("org.moblin.connman.Counter",
+       @dbus.service.method("net.connman.Counter",
                                in_signature='oa{sv}a{sv}', out_signature='')
        def Usage(self, path, home, roaming):
-               print "%s" % (path)
-               print_stats(home)
-               print_stats(roaming)
+               print("%s" % (path))
+
+               if len(home) > 0:
+                       print("  Home")
+                       print_stats(home)
+               if len(roaming) > 0:
+                       print("  Roaming")
+                       print_stats(roaming)
 
 if __name__ == '__main__':
        dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
 
        bus = dbus.SystemBus()
-       manager = dbus.Interface(bus.get_object('org.moblin.connman', "/"),
-                                       'org.moblin.connman.Manager')
+       manager = dbus.Interface(bus.get_object('net.connman', "/"),
+                                       'net.connman.Manager')
 
-       interval = 2
+       period = 2
        if len(sys.argv) > 1:
-               interval = sys.argv[1]
+               period = sys.argv[1]
 
-       path = "/test/counter%s" % interval
+       path = "/test/counter%s" % period
        object = Counter(bus, path)
 
-       manager.RegisterCounter(path, dbus.UInt32(interval))
+       manager.RegisterCounter(path, dbus.UInt32(10), dbus.UInt32(period))
 
        mainloop = gobject.MainLoop()
        mainloop.run()