Gorka

chat_client.py

@@ -31,18 +31,18 @@ def check_inactivity():
     global end
     while True:
 
-        if time.time() - last_message_time > 5 * 1:  # 5 minutos
+        if time.time() - last_message_time > 5 * 60:  # 5 minutos
             print("Llevas demasiado tiempo inactivo, cerrando conexión...")
             close_message = f'{username} se ha desconectado por inactividad'
             client.send(close_message.encode('utf-8'))
             end = True
             time.sleep(1)
             close()
             return
-        if time.time() - last_message_time > 4 * 1:  # 4 minutos
+        if time.time() - last_message_time > 4 * 60:  # 4 minutos
             print("Si no escribes un mensaje dentro de un minuto, se cerrará la conexión.")
 
-        time.sleep(6)  # Comprobar cada minuto
+        time.sleep(60)  # Comprobar cada minuto
 
 # Instanciar un hilo para verificar la inactividad del usuario
 inactivity_thread = threading.Thread(target=check_inactivity)

chat_server.py

@@ -139,10 +139,12 @@ def remove(client):
         index = clients.index(client)
         clients.remove(client)
         client.close()
-        username = usernames[index]
-        broadcast(f'{username} ha abandonado el chat.'.encode('utf-8'), client)
-        usernames.remove(username)
+        remove_username(index)
 
+def remove_username(index):
+    username = usernames[index]
+    broadcast(f'{username} ha abandonado el chat.'.encode('utf-8'), client)
+    usernames.remove(username)
 # Función principal para aceptar conexiones de clientes
 
 

test_chat_server.py

@@ -0,0 +1,61 @@
+import chat_server
+import socket
+# pip install pytest-mock pytest
+
+def test_broadcastClientSendCalled(mocker):
+
+	#mocker.patch('chat_server.remove_username', return_value=None)
+	client = mocker.Mock()
+	client.send.return_value = None
+
+	spy = mocker.spy(chat_server, 'remove')
+	chat_server.clients = [client,client]
+	assert len(chat_server.clients) == 2
+
+	mocker.patch('chat_server.remove_username', return_value=None)
+
+
+	assert chat_server.broadcast('hola', None) == None
+	assert client.send.called
+	assert spy.call_count == 0
+
+def test_broadcastClientSendNotCalled(mocker):
+
+	#mocker.patch('chat_server.remove_username', return_value=None)
+	client = mocker.Mock()
+	client.send.return_value = None
+
+	chat_server.clients = [client,client]
+	assert len(chat_server.clients) == 2
+
+	mocker.patch('chat_server.remove_username', return_value=None)
+	spy = mocker.spy(chat_server, 'remove')
+
+
+	assert chat_server.broadcast('hola', client) == None
+	assert not client.send.called
+
+def test_broadcastClientSendException(mocker):
+
+	#mocker.patch('chat_server.remove_username', return_value=None)
+	client = mocker.Mock()
+	client.send.side_effect = socket.error()
+
+	chat_server.clients = [client,client]
+	assert len(chat_server.clients) == 2
+	mocker.patch('chat_server.remove_username', return_value=None)
+	spy = mocker.spy(chat_server, 'remove')
+
+
+	assert chat_server.broadcast('hola', None) == None
+	assert client.send.called
+	assert spy.called == True
+
+
+
+
+
+#def test_filter_address():
+#	assert chat_server.filter_address(psutil.net_if_addrs().items()) == False
+
+