Merge pull request #136 from FreeOpcUa/dev2

add tests for connection with crypto

opcua/server/binary_server.py

-"""
-Socket server forwarding request to internal server
-"""
-import logging
-try:
-    import socketserver
-except ImportError:
-    import SocketServer as socketserver
-from threading import Thread
-from threading import Condition
-
-from opcua import ua
-from opcua.uaprocessor import UaProcessor
-
-logger = logging.getLogger(__name__)
-
-
-class BinaryServer(Thread):
-
-    """
-    Socket server forwarding request to internal server
-    """
-
-    def __init__(self, internal_server, hostname, port):
-        Thread.__init__(self)
-        self.socket_server = None
-        self.hostname = hostname
-        self.port = port
-        self.iserver = internal_server
-        self._cond = Condition()
-
-    def start(self):
-        with self._cond:
-            Thread.start(self)
-            self._cond.wait()
-
-    def run(self):
-        logger.warning("Listening on %s:%s", self.hostname, self.port)
-        socketserver.TCPServer.allow_reuse_address = True  # get rid of address already in used warning
-        self.socket_server = ThreadingTCPServer((self.hostname, self.port), UAHandler)
-        # self.socket_server.daemon_threads = True # this will force a shutdown of all threads, maybe too hard
-        self.socket_server.internal_server = self.iserver  # allow handler to acces server properties
-        with self._cond:
-            self._cond.notify_all()
-        self.socket_server.serve_forever()
-
-    def stop(self):
-        logger.warning("server shutdown request")
-        self.socket_server.shutdown()
-
-
-class UAHandler(socketserver.BaseRequestHandler):
-
-    """
-    The RequestHandler class for our server.
-
-    It is instantiated once per connection to the server, and must
-    override the handle() method to implement communication to the
-    client.
-    """
-
-    def handle(self):
-        sock = ua.utils.SocketWrapper(self.request)
-        processor = UaProcessor(self.server.internal_server, sock, self.client_address)
-        try:
-            while True:
-                hdr = ua.Header.from_string(sock)
-                body = sock.read(hdr.body_size)
-                ret = processor.process(hdr, ua.utils.Buffer(body))
-                if not ret:
-                    break
-        except ua.utils.SocketClosedException:
-            logger.warning("Server has closed connection")
-        except Exception:
-            logger.exception("Exception raised while parsing message from client, closing")
-
-
-class ThreadingTCPServer(socketserver.ThreadingMixIn, socketserver.TCPServer):
-    pass

tests/tests.py

@@ -3,6 +3,13 @@ import logging
 import sys
 sys.path.insert(0, "..")
 sys.path.insert(0, ".")
+try:
+    from opcua.crypto import uacrypto
+    CRYPTOGRAPHY_AVAILABLE = True
+except ImportError:
+    print("WARNING: CRYPTO NOT AVAILABLE, CRYPTO TESTS DISABLED!!")
+    CRYPTOGRAPHY_AVAILABLE = False
+
 
 
 
@@ -10,7 +17,8 @@ from tests_cmd_lines import TestCmdLines
 from tests_server import TestServer
 from tests_client import TestClient
 from tests_unit import Unit
-from tests_crypto_connect import TestCryptoConnect
+if CRYPTOGRAPHY_AVAILABLE:
+    from tests_crypto_connect import TestCryptoConnect
 
 
 if __name__ == '__main__':

tests/tests_client.py

@@ -25,7 +25,8 @@ class TestClient(unittest.TestCase, CommonTests):
         self.srv.start()
 
         # start admin client
-        self.clt = Client('opc.tcp://admin@localhost:%d' % port_num1)
+        # long timeout since travis (automated testing) can be really slow
+        self.clt = Client('opc.tcp://admin@localhost:%d' % port_num1, timeout=10)
         self.clt.connect()
         self.opc = self.clt