Test maintenant simple car lance automatiquement le serveur (simulateur

tele) comme un thread

Test maintenant simple car lance automatiquement le serveur (simulateur
tele) comme un thread
Etienne Pallier
1 parent ca2504aa
Showing 8 changed files with 98 additions and 13 deletions Show diff stats
sockets_tele/.gitignore
sockets_tele/README.txt
sockets_tele/src/client/socket_client_abstract.py
sockets_tele/src/client/socket_client_telescope_abstract.py
sockets_tele/src/client/socket_client_telescope_gemini.py
sockets_tele/src/server/server_udp_or_tcp.py
sockets_tele/test/.gitignore
sockets_tele/test/test_client_gemini.py
@@ -0,0 +1 @@
+/client.log
@@ -44,13 +44,16 @@ Pour lancer le client sur le &quot;simulateur&quot; de telescope (localhost, port 11110):
  
  
 ********************************************************************************************
-Pour lancer les tests:
-- dans un terminal, lancer le simulateur: ./server_run.py
-- dans un autre terminal, lancer les tests client: 
+Pour lancer les TESTS:
 cd test/
 ./test_client_gemini.py 
  
-********************************************************************************************
+Ca doit se terminer par quelque chose comme:
+Ran 1 test in 0.005s
+OK
+
+Là, il faut arrêter avec CTRL-C (car je ne sais pas encore comment arrêter le serveur simulateur autrement !)
+
  
  
  
 #!/usr/bin/env python3
  
-import socket
+"""Socket Client (abstract) implementation
+
+To be used as a base class (interface) for any concrete socket client class
+"""
+
+
+# Standard library imports
 import logging
+import socket
+
+# Third party imports
+# None
+
+# Local application imports
+# None
+
+
+
  
 logger = None
 # Aliases for logger:
 #!/usr/bin/env python3
  
-import socket
+"""Socket Client Telescope (abstract) implementation
+
+To be used as a base class (interface) for any concrete socket client telescope class
+"""
+
+
+# Standard library imports
 import logging
+import socket
  
+# Third party imports
+# None
+
+# Local application imports
 #sys.path.append('../..')
 #from src.client.socket_client_abstract import UnknownCommandException, SocketClientAbstract
 from src.client.socket_client_abstract import *
  
  
  
+
+
+
 class Position():
     x = 0
     y = 0
 #!/usr/bin/env python3
  
-import socket
-import logging
-import sys
+"""Socket Client GEMINI Telescope implementation
  
+To be used as a concrete class to system control a GEMINI telescope
+"""
+
+
+# Standard library imports
+#import socket
+#import logging
+#import sys
+
+# Third party imports
+# None
+
+# Local application imports
 #sys.path.append('../..')
 from src.client.socket_client_telescope_abstract import Position, UnknownCommandException, SocketClientTelescopeAbstract
  
  
+
+TERMINATOR = '\x00'
+
+
 class SocketClientTelescopeGEMINI(SocketClientTelescopeAbstract):
  
     '''
@@ -2,8 +2,24 @@
  
 # cf https://docs.python.org/3/library/socketserver.html#socketserver-tcpserver-example
  
+"""Socket Server implementation
+
+To be used as a minimalist telescope simulator to which a socket client (SocketClient) can connect
+"""
+
+# Standard library imports
 import socketserver
  
+# Third party imports
+# None
+
+# Local application imports
+# None
+
+
+
+
+
 ###STAMP = '01000000'
 #STAMP = '0100000000000000'
 #HOST, PORT = "localhost", 11110
@@ -0,0 +1 @@
+/client.log
 #!/usr/bin/env python3
  
+import threading
+
 import unittest
  
 import sys
 sys.path.append('..')
+from src.server.server_udp_or_tcp import get_SocketServer_UDP_TCP
 from src.client.socket_client_telescope_gemini import SocketClientTelescopeGEMINI
  
+#HOST, PORT = "localhost", 9999
+#HOST, PORT = "localhost", 20001
+HOST, PORT = "localhost", 11110
  
 class TestClient(unittest.TestCase):
  
+
     def setUp(self):
         self.seq = range(10)
  
-    def test_run(self):
+    def server(self):
+        with get_SocketServer_UDP_TCP(HOST, PORT, "UDP") as myserver:
+            myserver.serve_forever()
  
-        #HOST, PORT = "localhost", 9999
-        #HOST, PORT = "localhost", 20001
-        HOST, PORT = "localhost", 11110
+    def test_run(self):
  
         qa = [
             (':toto#', 'TOTO'),
@@ -24,6 +31,13 @@ class TestClient(unittest.TestCase):
             #(':GD#', '+12:28')
         ]
  
+        #TODO: RUN SERVER in a thread
+        t_server = threading.Thread(target=self.server)
+        #threads.append(t)
+        t_server.start()
+        #time.sleep(3)
+        
+        # RUN CLIENT to connect to server
         #tsock = SocketClient_UDP_TCP(HOST, PORT, "UDP")
         with SocketClientTelescopeGEMINI(HOST, PORT) as tsock:
             # Only useful for TCP (does nothing for UDP)
@@ -44,6 +58,11 @@ class TestClient(unittest.TestCase):
             self.assertEqual(radec,  ['15:01:48', '+12:28'])
  
             #tsock.close()
+            
+        #TODO: Stop the server thread (t_server), how can we do that ?
+        # cf https://www.oreilly.com/library/view/python-cookbook-2nd/0596007973/ch09s03.html
+        #t_server.suicide_toi() !!!
+        
  
 if __name__ == '__main__':
     unittest.main()
 \ No newline at end of file