diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2019-04-02 13:49:42 -0400 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2019-04-02 13:49:42 -0400 |
| commit | a5b5d6490ce23a12c07d8c8deae1c2c320943112 (patch) | |
| tree | 84896cdea361bbebbfe47d1c1f378998925e8c73 /tests/testcases | |
| parent | 54a54a2907cbf8f07cab2c05dd478570c78cf3f1 (diff) | |
stuff, and timeline test case
Diffstat (limited to 'tests/testcases')
| -rw-r--r-- | tests/testcases/test.py | 26 | ||||
| -rw-r--r-- | tests/testcases/timeline.py | 5 |
2 files changed, 25 insertions, 6 deletions
diff --git a/tests/testcases/test.py b/tests/testcases/test.py index c9ee5d35..8eb8644e 100644 --- a/tests/testcases/test.py +++ b/tests/testcases/test.py @@ -20,6 +20,7 @@ import montage import state import events import logs +import timeline class ZmninjaAndroidTests(unittest.TestCase): @@ -92,6 +93,22 @@ class ZmninjaAndroidTests(unittest.TestCase): configs = []; # Add as many as you need + + ''' + configs.append ({ + 'portal': 'https://zm', + 'user': 'admin', + 'password': '', + 'use_auth': True, + 'use_zm_auth': True, + 'use_basic_auth': False, + 'basic_user': None, + 'basic_password': None, + 'screenshot_dir': './screenshots', + 'restart': False, + 'prompt': True + }) + ''' configs.append ({ 'portal': 'https://demo.zoneminder.com/zm', @@ -104,11 +121,11 @@ class ZmninjaAndroidTests(unittest.TestCase): 'basic_password': None, 'screenshot_dir': './screenshots', 'restart': False, - 'prompt': False + 'prompt': True }) configs.append ({ - 'portal': 'https://10.6.1.16/zm', + 'portal': 'https://10.6.1.32/zm', 'user': 'admin', 'password': 'admin', 'use_auth': True, @@ -154,9 +171,10 @@ class ZmninjaAndroidTests(unittest.TestCase): sleep(5) wizard.run_tests(self, isFirstRun) isFirstRun = False - #montage.run_tests(self) - #events.run_tests(self) logs.run_tests(self) + montage.run_tests(self) + events.run_tests(self) + timeline.run_tests(self) if c.testConfig['restart']: state.run_tests(self) diff --git a/tests/testcases/timeline.py b/tests/testcases/timeline.py index 59d94bb2..c4c1ff8f 100644 --- a/tests/testcases/timeline.py +++ b/tests/testcases/timeline.py @@ -9,7 +9,8 @@ import app def run_tests(self): app.tap_menu_js() c.log ('Validating timeline') - _wait_for_id('timeline-ctrl') - c.take_screenshot(None, 'view-after-timeline-draw.png') + c.click_item('testaut_menu_timeline') + c._wait_for_id('timeline-ctrl') + c.take_screenshot(None, 'view-after-timeline-draw.png') |