syncloud-lib 359__tar.gz → 361__tar.gz

{syncloud_lib-359/syncloud_lib.egg-info → syncloud_lib-361}/PKG-INFO

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

{syncloud_lib-359 → syncloud_lib-361/syncloud_lib.egg-info}/PKG-INFO

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

{syncloud_lib-359 → syncloud_lib-361}/syncloudlib/integration/device.py

@@ -107,5 +107,31 @@ class Device:
         return run_scp('-r {0} root@{1}:{2}'.format(dir_from, self.domain, dir_to), password=self.ssh_password,
                        throw=throw)
 
+    def login_v2(self, retries=5):
+        session = requests.session()
+        session.mount('https://{0}'.format(self.domain), HTTPAdapter(max_retries=retries))
+        retry = 0
+        while True:
+            try:
+                token = run_ssh(self.domain,
+                                'snap run platform.cli login {0} {1}'.format(self.device_user, self.device_password),
+                                password=self.ssh_password)
+                token = token.strip()
+                response = session.post('https://{0}/rest/login/token'.format(self.domain), verify=False,
+                                        allow_redirects=False, json={'token': token})
+                if response.status_code != 200:
+                    raise Exception('token login failed: {0}'.format(response.text))
+                response = session.get('https://{0}/rest/user'.format(self.domain), verify=False,
+                                       allow_redirects=False)
+                if response.status_code == 200:
+                    self.session = session
+                    return session
+            except Exception as e:
+                print(str(e))
+                print('retry {0} of {1}'.format(retry, retries))
+            retry += 1
+            if retry > retries:
+                raise Exception('cannot login')
+
     def http_get(self, url):
         return self.session.get('https://{0}{1}'.format(self.domain, url), allow_redirects=False, verify=False)

{syncloud_lib-359 → syncloud_lib-361}/syncloudlib/integration/selenium_wrapper.py

@@ -97,6 +97,8 @@ class SeleniumWrapper:
 
     def screenshot(self, name, throw=True):
         log.info('screenshot')
+        self.driver.find_element(By.TAG_NAME, "body").click()
+        time.sleep(1)
         retries = 5
         retry_counter = 0
         while True:

syncloud_lib-361/version

@@ -0,0 +1 @@
+361

syncloud_lib-359/version

@@ -1 +0,0 @@
-359