little changes + tests

test/test_ServerClient.py

@@ -78,6 +78,9 @@ class Test_ServerClient:
         assert self.testClient1.connect()
         self.testClient2 = TCPClient()
         assert self.testClient2.connect()
+        time.sleep(0.1)  # wait for all clients connected
+        # check connected clients
+        assert useServer.countClientsConnected() == 2
         # disconnect all
         assert self.testClient1.disconnect()
         assert self.testClient2.disconnect()
@@ -107,6 +110,8 @@ class Test_ServerClient:
         assert self.testClient3.receive() == "[ack]"
         assert self.testClient2.receive() == "[ack]"
         assert self.testClient1.receive() == "[ack]"
+        # check server msg queue
+        assert useServer.countPacketsInQueue() == 3
         # disconnect all
         assert self.testClient1.disconnect()
         assert self.testClient2.disconnect()
@@ -150,6 +155,7 @@ class Test_ServerClient:
         assert self.testClient1.receive() == "[ack]"
         assert self.testClient2.receive() == "[ack]"
         # _check server output data
+        assert useServer.countPacketsInQueue() == 2
         assert useServer.getDataFromQueue()[1] == "test1"
         assert useServer.getDataFromQueue()[1] == "test2"
         assert useServer.getDataFromQueue() is None  # Last _check must be None

test/test_paths.py

@@ -0,0 +1,46 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+"""!
+    ____  ____  ______       __      __       __       _____
+   / __ )/ __ \/ ___/ |     / /___ _/ /______/ /_     |__  /
+  / __  / / / /\__ \| | /| / / __ `/ __/ ___/ __ \     /_ <
+ / /_/ / /_/ /___/ /| |/ |/ / /_/ / /_/ /__/ / / /   ___/ /
+/_____/\____//____/ |__/|__/\__,_/\__/\___/_/ /_/   /____/
+                German BOS Information Script
+                     by Bastian Schroll
+
+@file:        test_paths.py
+@date:        22.02.2017
+@author:      Bastian Schroll
+@description: Unittests for BOSWatch. File must be _run as "pytest" unittest
+"""
+import logging
+import os
+
+from boswatch.utils import paths
+
+
+class Test_Config:
+    """!Unittests for the paths"""
+
+    def setup_method(self, method):
+        logging.debug("[TEST] %s.%s" % (type(self).__name__, method.__name__))
+
+    def test_fileExists(self):
+        """!load a local config file"""
+        assert paths.fileExist("README.md")
+
+    def test_fileNotExists(self):
+        """!load a local config file"""
+        assert not paths.fileExist("notFound.txt")
+
+    def test_makeDirNotExisting(self):
+        """!load a local config file"""
+        assert paths.makeDirIfNotExist("UnItTeSt")
+        os.removedirs("UnItTeSt")
+
+    def test_makeDirExisting(self):
+        """!load a local config file"""
+        paths.makeDirIfNotExist("UnItTeSt")
+        assert paths.makeDirIfNotExist("UnItTeSt")
+        os.removedirs("UnItTeSt")