From 3028a8ebc926247d54aa5788bc7f56f3732666fe Mon Sep 17 00:00:00 2001 From: shortcutme Date: Fri, 9 Feb 2018 14:15:43 +0100 Subject: [PATCH] Rev3313, Remove local announcer binding to ip to make test pass on linux --- plugins/AnnounceLocal/BroadcastServer.py | 2 +- plugins/AnnounceLocal/Test/TestAnnounce.py | 2 -- src/Config.py | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/plugins/AnnounceLocal/BroadcastServer.py b/plugins/AnnounceLocal/BroadcastServer.py index 9681860d..82570fba 100644 --- a/plugins/AnnounceLocal/BroadcastServer.py +++ b/plugins/AnnounceLocal/BroadcastServer.py @@ -84,7 +84,7 @@ class BroadcastServer(object): addr = ("255.255.255.255", port) message["sender"] = self.sender_info - self.log.debug("Broadcast to ips %s on port %s: %s" % (my_ips, port, message["cmd"])) + self.log.debug("Broadcast using ips %s on port %s: %s" % (my_ips, port, message["cmd"])) for my_ip in my_ips: sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) diff --git a/plugins/AnnounceLocal/Test/TestAnnounce.py b/plugins/AnnounceLocal/Test/TestAnnounce.py index f972a8b5..5af83c01 100644 --- a/plugins/AnnounceLocal/Test/TestAnnounce.py +++ b/plugins/AnnounceLocal/Test/TestAnnounce.py @@ -13,7 +13,6 @@ def announcer(file_server, site): file_server.sites[site.address] = site file_server.local_announcer.listen_port = 1100 file_server.local_announcer.sender_info["broadcast_port"] = 1100 - file_server.local_announcer.listen_ip = file_server.local_announcer.getMyIps()[0] gevent.spawn(file_server.local_announcer.start) time.sleep(0.3) @@ -26,7 +25,6 @@ def announcer_remote(site_temp): file_server_remote.sites[site_temp.address] = site_temp file_server_remote.local_announcer.listen_port = 1101 file_server_remote.local_announcer.sender_info["broadcast_port"] = 1101 - file_server_remote.local_announcer.listen_ip = file_server_remote.local_announcer.getMyIps()[0] gevent.spawn(file_server_remote.local_announcer.start) time.sleep(0.3) diff --git a/src/Config.py b/src/Config.py index b4fec02e..858fbb90 100644 --- a/src/Config.py +++ b/src/Config.py @@ -10,7 +10,7 @@ class Config(object): def __init__(self, argv): self.version = "0.6.2" - self.rev = 3312 + self.rev = 3313 self.argv = argv self.action = None self.config_file = "zeronet.conf"