Update tests configuration

Author: Serhii Khalymon

.travis.yml

@@ -10,6 +10,7 @@ addons:
 language: python
 python:
  - 2.7
+ - 3.4
  - 3.5
  - 3.6
 env:

tests/conftest.py

@@ -55,10 +55,15 @@ def eyes(request):
 
 
 @pytest.fixture(scope="function")
-def eyes_session(request, eyes, driver):
+def eyes_open(request, eyes, driver):
     test_page_url = request.node.get_closest_marker('test_page_url').args[-1]
-    viewport_size = request.node.get_closest_marker('viewport_size').args[-1]
-    test_suite_name = request.node.get_closest_marker('test_suite_name').args[-1]
+
+    viewport_size = request.node.get_closest_marker('viewport_size')
+    viewport_size = viewport_size.args[-1] if viewport_size else None
+
+    test_suite_name = request.node.get_closest_marker('test_suite_name')
+    test_suite_name = test_suite_name.args[-1] if test_suite_name else 'Python SDK'
+
     # use camel case in method name for fit java sdk tests name
     test_name = request.function.__name__.title().replace('_', '')
 
@@ -68,19 +73,24 @@ def eyes_session(request, eyes, driver):
     driver = eyes.open(driver, test_suite_name, test_name,
                        viewport_size=viewport_size)
     driver.get(test_page_url)
+    yield eyes, driver
+    results = eyes.close()
+    print(results)
 
+
+@pytest.fixture(scope="function")
+def eyes_for_class(request, eyes_open):
     # TODO: implement eyes.setDebugScreenshotsPrefix("Java_" + testName + "_");
 
+    eyes, driver = eyes_open
     request.cls.eyes = eyes
     request.cls.driver = driver
 
     yield
-    results = eyes.close()
-    print(results)
 
 
 @pytest.fixture(scope="function")
-def driver_session(request, driver):
+def driver_for_class(request, driver):
     test_page_url = request.node.get_closest_marker('test_page_url').args[0]
     viewport_size = request.node.get_closest_marker('viewport_size').args[0]
 
@@ -140,9 +150,9 @@ def pytest_addoption(parser):
 def _get_capabilities(platform_name=None, browser_name=None, headless=False):
     if platform_name is None:
         sys2platform_name = {
-            'linux': 'Linux',
+            'linux':  'Linux',
             'darwin': 'macOS 10.13',
-            'win32': 'Windows 10'
+            'win32':  'Windows 10'
         }
         platform_name = sys2platform_name[sys.platform]
     platform = SUPPORTED_PLATFORMS_DICT[platform_name]

tests/platfroms.py

@@ -85,24 +85,28 @@ def full_name(self):
         "deviceName":        "Iphone Emulator",
         "deviceOrientation": "portrait",
         "browserName":       "Safari",
+        "newCommandTimeout": 60 * 5
     }),
     Platform(name='Android', version='6.0', browsers=[], extra={
-        "appiumVersion":                 "1.9.1",
-        "deviceName":                    "Android Emulator",
-        "deviceOrientation":             "portrait",
-        "browserName":                   "Chrome",
+        "appiumVersion":     "1.9.1",
+        "deviceName":        "Android Emulator",
+        "deviceOrientation": "portrait",
+        "browserName":       "Chrome",
+        "newCommandTimeout": 60 * 5
     }),
     Platform(name='Android', version='7.0', browsers=[], extra={
-        "appiumVersion":                 "1.9.1",
-        "deviceName":                    "Android Emulator",
-        "deviceOrientation":             "portrait",
-        "browserName":                   "Chrome",
+        "appiumVersion":     "1.9.1",
+        "deviceName":        "Android Emulator",
+        "deviceOrientation": "portrait",
+        "browserName":       "Chrome",
+        "newCommandTimeout": 60 * 5
     }),
     Platform(name='Android', version='8.0', browsers=[], extra={
         "appiumVersion":     "1.9.1",
         "deviceName":        "Samsung S9+",
         "deviceOrientation": "portrait",
         "browserName":       "Chrome",
+        "newCommandTimeout": 60 * 5
     })
 ]
 SUPPORTED_PLATFORMS_DICT = {platform.full_name: platform for platform in SUPPORTED_PLATFORMS}

tests/selenium/test_appium.py

@@ -17,23 +17,31 @@ def test_android_native(eyes, driver):
 
 @pytest.mark.mobile
 @pytest.mark.platform('Android')
-@pytest.mark.eyes(hide_scrollbars=False)
-def test_final_application_android(eyes, driver):
-    driver = eyes.open(driver, "sample2", "titleicon5")
-    driver.get("http://applitools.com")
+@pytest.mark.parametrize('eyes', [
+    {'force_full_page_screenshot': True, 'hide_scrollbars': False},
+    {'force_full_page_screenshot': False, 'hide_scrollbars': False},
+],
+                         indirect=True,
+                         ids=lambda o: "with FSP" if o['force_full_page_screenshot'] else "no FSP")
+@pytest.mark.test_page_url('http://applitools.com')
+def test_final_application_android(eyes_open):
+    eyes, driver = eyes_open
     eyes.check_window("test2")
     btn_element = driver.find_element_by_css_selector('button')
     eyes.check_region_by_element(btn_element, stitch_content=True)
-    eyes.close()
 
 
 @pytest.mark.mobile
 @pytest.mark.platform('iPhone')
-@pytest.mark.eyes(hide_scrollbars=False)
-def test_final_application_ios(eyes, driver):
-    driver = eyes.open(driver, "sample", "IOS")
-    driver.get("http://applitools.com")
+@pytest.mark.parametrize('eyes', [
+    {'force_full_page_screenshot': True, 'hide_scrollbars': False},
+    {'force_full_page_screenshot': False, 'hide_scrollbars': False},
+],
+                         indirect=True,
+                         ids=lambda o: "with FSP" if o['force_full_page_screenshot'] else "no FSP")
+@pytest.mark.test_page_url('http://applitools.com')
+def test_final_application_ios(eyes_open):
+    eyes, driver = eyes_open
     eyes.check_window()
     btn_element = driver.find_element_by_css_selector('button')
     eyes.check_region_by_element(btn_element, stitch_content=True)
-    eyes.close()

tests/selenium/test_dom_capture.py

@@ -10,7 +10,7 @@
 from applitools.selenium.capture import dom_capture
 
 
-@pytest.mark.usefixtures('driver_session')
+@pytest.mark.usefixtures('driver_for_class')
 @pytest.mark.browser('chrome')
 @pytest.mark.platform('Linux')
 @pytest.mark.viewport_size({'width': 800, 'height': 600})
@@ -88,7 +88,7 @@ def test_send_dom_nsa(self):
         assert inner_css(dom_json) == inner_css(expected_json)
 
 
-@pytest.mark.usefixtures("eyes_session")
+@pytest.mark.usefixtures("eyes_for_class")
 @pytest.mark.test_suite_name('Eyes Selenium SDK - DynamicPages')
 @pytest.mark.viewport_size({'width': 1200, 'height': 800})
 @pytest.mark.skip("Only for local testing because changes always")
@@ -121,7 +121,7 @@ def test_bestbuy(self):
         self.eyes.check_window("BestBuy Test")
 
 
-@pytest.mark.usefixtures("eyes_session")
+@pytest.mark.usefixtures("eyes_for_class")
 @pytest.mark.test_suite_name('Eyes Selenium SDK - CustomersPages')
 @pytest.mark.viewport_size({'width': 1200, 'height': 800})
 @pytest.mark.skip("Only for local testing because changes always")

tests/selenium/test_main_use_flows.py

@@ -6,7 +6,7 @@
 
 
 @pytest.mark.platform('Linux', 'Windows', 'macOS')
-@pytest.mark.usefixtures("eyes_session")
+@pytest.mark.usefixtures("eyes_for_class")
 @pytest.mark.parametrize('eyes', [
     {'force_full_page_screenshot': True},
     {'force_full_page_screenshot': False},

tox.ini

@@ -1,21 +1,29 @@
 [tox]
-envlist = lint,py27,py34,py35,py36
+envlist = lint,selenium,appium
 skip_missing_interpreters = true
 
 [travis]
 python =
-  2.7: py27
-  3.5: py35
-  3.6: lint
+    2.7: selenium
+    3.5: selenium
+    3.4: appium
+    3.6: lint
 
 [testenv]
 description = run linux chrome tests with pytest under {basepython}
 passenv = SAUCE_USERNAME SAUCE_ACCESS_KEY APPLITOOLS_API_KEY SELENIUM_SERVER_URL TOXENV CI DISPLAY TRAVIS TRAVIS_* APPLITOOLS_BATCH_ID
 extras = testing
+
+[testenv:selenium]
 commands =
-    pytest -n 2 --platform="Android 6.0" --remote 1 tests/selenium/test_appium.py
     pytest -n 2 --platform="Linux" --browser chrome --headless 1
 
+[testenv:appium]
+basepython = python3.4
+commands =
+    pytest -n 5 --platform="Android 6.0" --remote 1 tests/selenium/test_appium.py
+    pytest -n 2 --platform="iPhone 11.3" --remote 1 tests/selenium/test_appium.py
+
 
 [testenv:lint]
 basepython = python3.6