#791 - tweaks, rundirs

5 files changed, 24 insertions, 10 deletions

diff --git a/config.xml b/config.xml
index ac1b67fa..13f3b02b 100644
--- a/config.xml
+++ b/config.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget android-packageName="com.pliablepixels.zmninja_pro" id="com.pliablepixels.zmninja_pro" ios-CFBundleIdentifier="com.pliablepixels.zmninja-pro" version="1.3.051" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget android-packageName="com.pliablepixels.zmninja_pro" id="com.pliablepixels.zmninja_pro" ios-CFBundleIdentifier="com.pliablepixels.zmninja-pro" version="1.3.052" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>zmNinja</name>
     <description>
 	High performance ZoneMinder client
diff --git a/package.json b/package.json
index 6a97ea10..f0ac4afe 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "zmninjapro",
   "description": "Home security mobile app for ZoneMinder",
-  "version": "1.3.051",
+  "version": "1.3.052",
   "displayName": "zmNinja",
   "author": "Pliable Pixels",
   "license": "custom see LICENSE.md",
diff --git a/tests/testcases/montage.py b/tests/testcases/montage.py
index 2b3f2c4d..fa67ebaa 100644
--- a/tests/testcases/montage.py
+++ b/tests/testcases/montage.py
@@ -10,7 +10,7 @@ def run_tests(self):
     app.tap_menu_js()
     c.log ('Validating montage')
     c.click_item('testaut_menu_montage')
-    c.click_item('img-1')
+    c.click_item('img-0')
     sleep(4)
     c.take_screenshot(None,'montage-singleview.png')
     c.dbl_click_item('singlemonitor')
diff --git a/tests/testcases/test.py b/tests/testcases/test.py
index 621b6c60..0cc7e826 100644
--- a/tests/testcases/test.py
+++ b/tests/testcases/test.py
@@ -4,7 +4,7 @@ Invokes other test cases
 '''
 
 import unittest
-from time import sleep
+from time import sleep,localtime,strftime
 from appium import webdriver
 import os
 import glob
@@ -13,6 +13,7 @@ import common as c
 import wizard
 import app
 import montage
+import errno
  
 class ZmninjaAndroidTests(unittest.TestCase):
     'Class to run tests against zmNinja'
@@ -51,16 +52,29 @@ class ZmninjaAndroidTests(unittest.TestCase):
         c.testConfig['portal'] = 'https://demo.zoneminder.com/zm'
         c.testConfig['user'] = 'zmuser'
         c.testConfig['password'] = 'zmpass'
+
+        c.testConfig['portal'] = 'https://192.168.1.134/zm'
+        c.testConfig['user'] = 'admin'
+        c.testConfig['password'] = 'admin'
+
         c.testConfig['use_auth'] = True
         c.testConfig['use_zm_auth'] = True
         c.testConfig['use_basic_auth'] = False
-        c.testConfig['screenshot_dir'] = './screenshots'
 
-        if not os.path.exists(c.testConfig['screenshot_dir']):
+        run_dir = strftime('%b-%d-%I_%M_%S%p', localtime())
+        c.testConfig['screenshot_dir'] = './screenshots/'+run_dir
+        try:
             os.makedirs(c.testConfig['screenshot_dir'])
-        files = glob.glob(c.testConfig['screenshot_dir']+'/*')
-        for f in files:
-            os.remove(f)
+        except OSError as exc:
+            if exc.errno == errno.EEXIST and os.path.isdir(path):
+                pass
+            else:
+                raise
+
+
+        #files = glob.glob(c.testConfig['screenshot_dir']+'/*')
+        #for f in files:
+        #    os.remove(f)
 
         self.wait_for_app_start()
         wizard.run_tests(self)
diff --git a/www/js/NVR.js b/www/js/NVR.js
index 89002a5c..c9c674e2 100644
--- a/www/js/NVR.js
+++ b/www/js/NVR.js
@@ -20,7 +20,7 @@ angular.module('zmApp.controllers')
         DO NOT TOUCH zmAppVersion
         It is changed by sync_version.sh
       */
-      var zmAppVersion = "1.3.051";
+      var zmAppVersion = "1.3.052";
       var isBackground = false;
       var justResumed = false;
       var timeSinceResumed = -1;