syncloud-lib 343__tar.gz → 344__tar.gz

{syncloud_lib-343/syncloud_lib.egg-info → syncloud_lib-344}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: syncloud-lib
-Version: 343
+Version: 344
 Summary: Syncloud common library
 Home-page: https://github.com/syncloud/lib
 Author: Syncloud

{syncloud_lib-343 → syncloud_lib-344/syncloud_lib.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: syncloud-lib
-Version: 343
+Version: 344
 Summary: Syncloud common library
 Home-page: https://github.com/syncloud/lib
 Author: Syncloud

{syncloud_lib-343 → syncloud_lib-344}/syncloudlib/integration/conftest.py

@@ -1,12 +1,16 @@
-import pytest
+import logging
 import os
+import platform
 from os.path import join, exists
+
+import pytest
 from selenium import webdriver
 
-from syncloudlib.integration.installer import get_data_dir, get_app_dir, get_service_prefix, get_ssh_env_vars, get_snap_data_dir
 from syncloudlib.integration.device import Device
+from syncloudlib.integration.installer import get_data_dir, get_app_dir, get_service_prefix, get_ssh_env_vars, \
+    get_snap_data_dir
 from syncloudlib.integration.selenium_wrapper import SeleniumWrapper
-import logging
+
 log = logging.getLogger()
 
 arch_go_to_debian={
@@ -34,7 +38,7 @@ def pytest_addoption(parser):
     parser.addoption("--redirect-user", action="store", default="redirect-user-notset")
     parser.addoption("--redirect-password", action="store", default="redirect-password-notset")
     parser.addoption("--distro", action="store", default="distro")
-    parser.addoption("--arch", action="store", default="unset-arch")
+    parser.addoption("--arch", action="store")
     parser.addoption("--ver", action="store")
 
 
@@ -127,7 +131,10 @@ def distro(request):
 
 @pytest.fixture(scope='session')
 def arch(request):
-    return request.config.getoption("--arch")
+    arch = request.config.getoption("--arch")
+    if arch:
+        return arch
+    return arch_cpu_to_go[platform.machine()]
 
 
 @pytest.fixture(scope='session')

{syncloud_lib-343 → syncloud_lib-344}/syncloudlib/integration/selenium_wrapper.py

@@ -6,7 +6,8 @@ from syncloudlib.integration.screenshots import screenshots
 from selenium.webdriver.support.ui import WebDriverWait
 from selenium.webdriver.common.by import By
 from selenium.webdriver.support import expected_conditions
-
+import logging
+log = logging.getLogger()
 
 class SeleniumWrapper:
     def __init__(self, driver, ui_mode, screenshot_dir, app_domain, timeout, browser):
@@ -101,19 +102,19 @@ class SeleniumWrapper:
                         return
                 retry += 1
                 time.sleep(1)
-                print('retrying screenshot {0}'.format(retry))
+                log.debug('retrying screenshot {0}'.format(retry))
 
     def open_app(self, path=''):
         self.driver.get("https://{0}{1}".format(self.app_domain, path))
 
     def log(self):
         if self.browser != "chrome":
-            print("browser logs are only supported in chrome")
+            log.debug("browser logs are only supported in chrome")
             return
 
-        print("browser log")
+        log.debug("browser log")
         for entry in self.driver.get_log('browser'):
-            print(entry)
+            log.debug(entry)
 
     @retry(exceptions=Exception, tries=10, delay=1, backoff=2)
     def element_by_js(self, js):

syncloud_lib-344/version

@@ -0,0 +1 @@
+344

syncloud_lib-343/version

@@ -1 +0,0 @@
-343