masscollaborationlabs/p2pfs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Return boolean value for start method.

Browse source
This commit is contained in:
Yuxin Wang 2018-10-01 22:30:46 -04:00
parent 97b2a34bef
commit 854d1676bb
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
p2pfs/core/peer.py
View file

@ -40,7 +40,7 @@ class Peer(MessageServer):
self._server_sock = self._connect(self._serverconfig) self._server_sock = self._connect(self._serverconfig)
except ConnectionRefusedError: except ConnectionRefusedError:
logger.error('Server connection refused!') logger.error('Server connection refused!')
return False, 'Server connection refused!' return False
# start the internal server # start the internal server
super().start() super().start()
# send out register message # send out register message
@ -49,7 +49,7 @@ class Peer(MessageServer):
'type': MessageType.REQUEST_REGISTER, 'type': MessageType.REQUEST_REGISTER,
'address': self._sock.getsockname() 'address': self._sock.getsockname()
}) })
return True, None return True
def publish(self, file): def publish(self, file):
path, filename = os.path.split(file) path, filename = os.path.split(file)

1
p2pfs/core/server.py
View file

@ -36,6 +36,7 @@ class MessageServer:
thread = threading.Thread(target=self._listen) thread = threading.Thread(target=self._listen)
thread.start() thread.start()
self._threads.add(thread) self._threads.add(thread)
return True
def stop(self): def stop(self):
# shutdown the server # shutdown the server

8
tests/test_main.py
View file

@ -17,7 +17,7 @@ def fmd5(fname):
def test_server_refused(): def test_server_refused():
peer = Peer('localhost', 0, 'localhost', 8880) peer = Peer('localhost', 0, 'localhost', 8880)
started, _ = peer.start() started = peer.start()
assert not started assert not started
@ -32,9 +32,9 @@ def test_main():
for _ in range(500): for _ in range(500):
fout.write(os.urandom(1000 * 1000)) fout.write(os.urandom(1000 * 1000))
tracker_started, _ = tracker.start() tracker_started = tracker.start()
peer_1_started, _ = peer_1.start() peer_1_started = peer_1.start()
peer_2_started, _ = peer_2.start() peer_2_started = peer_2.start()
assert tracker_started and peer_1_started and peer_2_started assert tracker_started and peer_1_started and peer_2_started
# peer1 publish small file and peer2 downloads it # peer1 publish small file and peer2 downloads it