syncloud-lib 364__tar.gz → 366__tar.gz

{syncloud_lib-364/syncloud_lib.egg-info → syncloud_lib-366}/PKG-INFO

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

{syncloud_lib-364 → syncloud_lib-366/syncloud_lib.egg-info}/PKG-INFO

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

{syncloud_lib-364 → syncloud_lib-366}/syncloud_lib.egg-info/SOURCES.txt

@@ -31,6 +31,7 @@ syncloudlib/integration/hosts.py
 syncloudlib/integration/installer.py
 syncloudlib/integration/loop.py
 syncloudlib/integration/screenshots.py
+syncloudlib/integration/selenium_conftest.py
 syncloudlib/integration/selenium_wrapper.py
 syncloudlib/integration/ssh.py
 syncloudlib/json/__init__.py

{syncloud_lib-364 → syncloud_lib-366}/syncloudlib/integration/conftest.py

@@ -4,12 +4,10 @@ import platform
 from os.path import join, exists
 
 import pytest
-from selenium import webdriver
 
 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
 
 log = logging.getLogger()
 
@@ -30,11 +28,8 @@ def pytest_addoption(parser):
     parser.addoption("--device-host", action="store")
     parser.addoption("--app-archive-path", action="store")
     parser.addoption("--app", action="store")
-    parser.addoption("--ui-mode", action="store", default="desktop")
     parser.addoption("--device-user", action="store", default="user")
     parser.addoption("--build-number", action="store", default="local")
-    parser.addoption("--browser", action="store", default="firefox")
-    parser.addoption("--browser-height", action="store", default=2000)
     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")
@@ -45,17 +40,17 @@ def pytest_addoption(parser):
 @pytest.fixture(scope='session')
 def build_number(request):
     return request.config.getoption("--build-number")
-    
+
 
 @pytest.fixture(scope='session')
 def device_user(request):
     return request.config.getoption("--device-user")
-    
-    
+
+
 @pytest.fixture(scope='session')
 def device_password():
     return 'Password1'
-    
+
 
 @pytest.fixture(scope='session')
 def redirect_user(request):
@@ -65,16 +60,11 @@ def redirect_user(request):
 @pytest.fixture(scope='session')
 def redirect_password(request):
     return request.config.getoption("--redirect-password")
-    
-    
-@pytest.fixture(scope='session')
-def app(request):
-    return request.config.getoption("--app")
 
 
 @pytest.fixture(scope='session')
-def ui_mode(request):
-    return request.config.getoption("--ui-mode")
+def app(request):
+    return request.config.getoption("--app")
 
 
 @pytest.fixture(scope='session')
@@ -115,16 +105,6 @@ def domain(request, distro):
     return '{0}.com'.format(distro)
 
 
-@pytest.fixture(scope='session')
-def browser(request):
-    return request.config.getoption("--browser")
-
-
-@pytest.fixture(scope='session')
-def browser_height(request):
-    return int(request.config.getoption("--browser-height"))
-
-
 @pytest.fixture(scope='session')
 def distro(request):
     return request.config.getoption("--distro")
@@ -141,13 +121,13 @@ def arch(request):
 @pytest.fixture(scope='session')
 def app_domain(app, domain):
     return '{0}.{1}'.format(app, domain)
-    
+
 
 @pytest.fixture(scope="session")
 def platform_data_dir():
     return get_data_dir('platform')
 
-    
+
 @pytest.fixture(scope="session")
 def data_dir(app):
     return get_data_dir(app)
@@ -161,72 +141,13 @@ def snap_data_dir(app):
 @pytest.fixture(scope="session")
 def app_dir(app):
     return get_app_dir(app)
-    
+
 
 @pytest.fixture(scope="session")
 def service_prefix():
     return get_service_prefix()
 
 
-def new_firefox_driver(hub_url, ui_mode):
-    mobile_agent = "Mozilla/5.0 (iPhone; CPU iPhone OS 16_1_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.1 Mobile/15E148 Safari/604.1"
-    options = webdriver.FirefoxOptions()
-    options.set_preference('app.update.auto', False)
-    options.set_preference('app.update.enabled', False)
-    if ui_mode == "mobile":
-        options.set_preference("general.useragent.override", mobile_agent)
-    options.set_preference("devtools.console.stdout.content", True)
-    options.set_capability('acceptInsecureCerts', True)
-    options.set_capability('se:recordVideo', True)
-    options.set_preference("media.navigator.streams.fake", True)
-    options.set_preference("media.navigator.permission.disabled", True)
-
-    return webdriver.Remote(
-        command_executor=hub_url,
-        options=options
-    )
-
-
-def new_chrome_driver(hub_url, ui_mode):
-    mobile_agent = "Mozilla/5.0 (iPhone; CPU iPhone OS 16_1_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.1 Mobile/15E148 Safari/604.1"
-    options = webdriver.ChromeOptions()
-    if ui_mode == "mobile":
-        options.add_argument('user-agent={}'.format(mobile_agent))
-    #options.add_argument('--headless')
-    options.add_argument('--no-sandbox')
-    options.add_argument('--disable-dev-shm-usage')
-    options.set_capability('goog:loggingPrefs', {'performance': 'ALL'})
-    options.set_capability('acceptInsecureCerts', True)
-    options.set_capability('se:recordVideo', True)
-    options.add_argument("--use-fake-ui-for-media-stream")
-    options.add_argument("--use-fake-device-for-media-stream")
-    return webdriver.Remote(
-        command_executor=hub_url,
-        options=options
-    )
-
-
-@pytest.fixture(scope="session")
-def driver(ui_mode, browser, browser_height, request):
-    hub_url = 'http://selenium:4444/wd/hub'
-    width = 1024
-    if ui_mode == "mobile":
-        width = 400
-
-    if browser == "firefox":
-        driver = new_firefox_driver(hub_url, ui_mode)
-    else:
-        driver = new_chrome_driver(hub_url, ui_mode)
-    driver.set_window_rect(0, 0, width, browser_height)
-
-    def driver_quit():
-        driver.quit()
-
-    request.addfinalizer(driver_quit)
-
-    return driver
-
-
 @pytest.fixture(scope="session")
 def ssh_env_vars(app):
     return get_ssh_env_vars(app)
@@ -258,24 +179,3 @@ def artifact_dir(project_dir, distro):
     if not exists(artifact_dir):
         os.mkdir(artifact_dir)
     return artifact_dir
-
-
-@pytest.fixture(scope="session")
-def screenshot_dir(artifact_dir: str, ui_mode: str):
-    ui_dir = join(artifact_dir, ui_mode)
-    if not exists(ui_dir):
-        os.mkdir(ui_dir)
-    screenshot_dir = join(ui_dir, 'screenshot')
-    if not exists(screenshot_dir):
-        os.mkdir(screenshot_dir)
-    return screenshot_dir
-
-
-@pytest.fixture(scope="session")
-def selenium_timeout():
-    return 10
-
-
-@pytest.fixture(scope="session")
-def selenium(driver, ui_mode, screenshot_dir, app_domain, selenium_timeout, browser):
-    return SeleniumWrapper(driver, ui_mode, screenshot_dir, app_domain, selenium_timeout, browser)

{syncloud_lib-364 → syncloud_lib-366}/syncloudlib/integration/device.py

@@ -42,6 +42,8 @@ class Device:
     def activate_custom(self, channel="stable"):
         ip = socket.gethostbyname(self.domain)
         run_ssh(self.domain, 'echo "{0} auth.{1}" >> /etc/hosts'.format(ip, self.domain), password=self.ssh_password, retries=10)
+        run_ssh(self.domain, 'snap set system refresh.hold=$(date -d "+90 days" -u +%Y-%m-%dT%H:%M:%SZ)', password=self.ssh_password)
+        run_ssh(self.domain, 'rm -f /var/snap/platform/current/syncloud.crt', password=self.ssh_password)
 
         wait_for_rest(requests.session(), "https://{0}/rest/id".format(self.domain), 200, 10)
         response = requests.post('https://{0}/rest/activate/custom'.format(self.domain),

syncloud_lib-366/syncloudlib/integration/selenium_conftest.py

@@ -0,0 +1,109 @@
+import os
+from os.path import join, exists
+
+import pytest
+from selenium import webdriver
+
+from syncloudlib.integration.conftest import pytest_addoption as _base_pytest_addoption
+from syncloudlib.integration.selenium_wrapper import SeleniumWrapper
+
+
+def pytest_addoption(parser):
+    _base_pytest_addoption(parser)
+    parser.addoption("--ui-mode", action="store", default="desktop")
+    parser.addoption("--browser", action="store", default="firefox")
+    parser.addoption("--browser-height", action="store", default=2000)
+
+
+@pytest.fixture(scope='session')
+def ui_mode(request):
+    return request.config.getoption("--ui-mode")
+
+
+@pytest.fixture(scope='session')
+def browser(request):
+    return request.config.getoption("--browser")
+
+
+@pytest.fixture(scope='session')
+def browser_height(request):
+    return int(request.config.getoption("--browser-height"))
+
+
+def new_firefox_driver(hub_url, ui_mode):
+    mobile_agent = "Mozilla/5.0 (iPhone; CPU iPhone OS 16_1_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.1 Mobile/15E148 Safari/604.1"
+    options = webdriver.FirefoxOptions()
+    options.set_preference('app.update.auto', False)
+    options.set_preference('app.update.enabled', False)
+    if ui_mode == "mobile":
+        options.set_preference("general.useragent.override", mobile_agent)
+    options.set_preference("devtools.console.stdout.content", True)
+    options.set_capability('acceptInsecureCerts', True)
+    options.set_capability('se:recordVideo', True)
+    options.set_preference("media.navigator.streams.fake", True)
+    options.set_preference("media.navigator.permission.disabled", True)
+
+    return webdriver.Remote(
+        command_executor=hub_url,
+        options=options
+    )
+
+
+def new_chrome_driver(hub_url, ui_mode):
+    mobile_agent = "Mozilla/5.0 (iPhone; CPU iPhone OS 16_1_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.1 Mobile/15E148 Safari/604.1"
+    options = webdriver.ChromeOptions()
+    if ui_mode == "mobile":
+        options.add_argument('user-agent={}'.format(mobile_agent))
+    options.add_argument('--no-sandbox')
+    options.add_argument('--disable-dev-shm-usage')
+    options.set_capability('goog:loggingPrefs', {'performance': 'ALL'})
+    options.set_capability('acceptInsecureCerts', True)
+    options.set_capability('se:recordVideo', True)
+    options.add_argument("--use-fake-ui-for-media-stream")
+    options.add_argument("--use-fake-device-for-media-stream")
+    return webdriver.Remote(
+        command_executor=hub_url,
+        options=options
+    )
+
+
+@pytest.fixture(scope="session")
+def driver(ui_mode, browser, browser_height, request):
+    hub_url = 'http://selenium:4444/wd/hub'
+    width = 1024
+    if ui_mode == "mobile":
+        width = 400
+
+    if browser == "firefox":
+        driver = new_firefox_driver(hub_url, ui_mode)
+    else:
+        driver = new_chrome_driver(hub_url, ui_mode)
+    driver.set_window_rect(0, 0, width, browser_height)
+
+    def driver_quit():
+        driver.quit()
+
+    request.addfinalizer(driver_quit)
+
+    return driver
+
+
+@pytest.fixture(scope="session")
+def screenshot_dir(artifact_dir, ui_mode):
+    ui_dir = join(artifact_dir, ui_mode)
+    if not exists(ui_dir):
+        os.mkdir(ui_dir)
+    screenshot_dir = join(ui_dir, 'screenshot')
+    if not exists(screenshot_dir):
+        os.mkdir(screenshot_dir)
+    return screenshot_dir
+
+
+@pytest.fixture(scope="session")
+def selenium_timeout():
+    return 10
+
+
+@pytest.fixture(scope="session")
+def selenium(driver, ui_mode, screenshot_dir, app_domain, selenium_timeout, browser):
+    return SeleniumWrapper(driver, ui_mode, screenshot_dir, app_domain, selenium_timeout, browser)

syncloud_lib-366/version

@@ -0,0 +1 @@
+366

syncloud_lib-364/version

@@ -1 +0,0 @@
-364