v1.1.1 : Fixed functional tests & Multiple bugfixes

2016-11-12 12:55:32 +01:00
parent f80af6bd58
commit 553524ae43
34 changed files with 663 additions and 356 deletions
@@ -1,18 +1,19 @@
 {
-    "Output": "cameratest.log.xml",
-    "Cameradar" : {
-    "Path": "/cctv/bin/cameradar",
-    "Args": "-l 1 -c tmp_config",
-    "Ports": "554,5554,8554,5548",
-    "IdsPath": "/conf/ids.json",
-    "RoutesPath": "/conf/url.json",
-    "ThumbPath": "/thumbnails",
-    "dbHost": "mysql_cameradar",
-    "dbPort": 3306,
-    "dbUser": "root",
-    "dbPassword": "root",
-    "dbName": "cctv",
-    "Console": false
+    "output": "test-results.xml",
+
+    "cameradar" : {
+        "path": "/cameradar/bin/cameradar",
+        "args": "-s 172.17.0.0/24 -c /conf/cameradar.conf.json --gst-rtsp-server",
+        "ports": "554,5554,8554",
+        "ids_path": "conf/ids.json",
+        "routes_path": "conf/url.json",
+        "thumb_path": "/tmp",
+        "db_host": "cameradar-database",
+        "db_port": 3306,
+        "db_user": "root",
+        "db_password": "root",
+        "db_name": "cmrdr",
+    	  "console": false
    },
-    "Tests" : __CAMERAS__
-}
+    "tests" : __CAMERAS__
+}