hardpy 0.18.0__tar.gz → 0.18.2__tar.gz

{hardpy-0.18.0 → hardpy-0.18.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hardpy
-Version: 0.18.0
+Version: 0.18.2
 Summary: HardPy library for device testing
 Project-URL: Homepage, https://github.com/everypinio/hardpy/
 Project-URL: Documentation, https://everypinio.github.io/hardpy/

{hardpy-0.18.0 → hardpy-0.18.2}/hardpy/cli/cli.py

@@ -330,9 +330,13 @@ def _validate_running_config(config: HardpyConfig, tests_dir: str) -> None:
         sys.exit()
 
 def _validate_config(config: HardpyConfig) -> None:
-    if config.stand_cloud.autosync_timeout < 1:
-        print("StandCloud autosync timeout must be greater than 0.")
-        sys.exit()
+    if config.stand_cloud.autosync:
+        if config.stand_cloud.autosync_timeout < 1:
+            print("StandCloud autosync timeout must be greater than 0.")
+            sys.exit()
+        if not config.stand_cloud.api_key:
+            print("StandCloud API key is empty.")
+            sys.exit()
 
 
 def _request_hardpy(url: str, timeout: int = 5) -> str:

{hardpy-0.18.0 → hardpy-0.18.2}/hardpy/common/stand_cloud/connector.py

@@ -166,7 +166,7 @@ class StandCloudConnector:
         except OAuth2Error as exc:
             raise StandCloudError(exc.description) from exc
         except RequestException as exc:
-            raise StandCloudError(exc.strerror) from exc  # type: ignore
+            raise StandCloudError(exc.strerror or str(exc)) from exc  # type: ignore
 
         return resp
 

{hardpy-0.18.0 → hardpy-0.18.2}/hardpy/common/stand_cloud/exception.py

@@ -4,6 +4,3 @@
 
 class StandCloudError(Exception):
     """Base StandCloud error."""
-
-    def __init__(self, msg: str) -> None:
-        super().__init__(f"StandCloud error: {msg}")

{hardpy-0.18.0 → hardpy-0.18.2}/hardpy/common/stand_cloud/token_manager.py

@@ -124,6 +124,8 @@ class TokenManager:
             storage_keyring = load_keyring("keyring.backends.SecretService.Keyring")
         elif system() == "Windows":
             storage_keyring = load_keyring("keyring.backends.Windows.WinVaultKeyring")
+        elif system() == "Darwin":
+            storage_keyring = load_keyring("keyring.backends.macOS.KeyChain")
         # TODO(xorialexandrov): add memory keyring or other store
         mem_keyring = storage_keyring
 

{hardpy-0.18.0 → hardpy-0.18.2}/hardpy/hardpy_panel/api.py

@@ -93,9 +93,8 @@ async def sync_stand_cloud(sc_sync_interval_minutes: int) -> None:
         except asyncio.CancelledError:
             logger.info("StandCloud synchronization task cancelled.")
             break
-        except Exception:  # noqa: BLE001
-            # TODO (xorialexandrov): add more information to logging
-            logger.info("Error during StandCloud synchronization")
+        except Exception as exc:  # noqa: BLE001
+            logger.info(f"Error during StandCloud synchronization. {exc}")
         await asyncio.sleep(sc_sync_interval)
 
 
@@ -208,12 +207,11 @@ async def stand_cloud_sync() -> dict:
             app.state.executor,
             app.state.sc_synchronizer.sync,
         )
-    except Exception:  # noqa: BLE001
-        msg = "Error during StandCloud synchronization"
-        # TODO (xorialexandrov): add more information to logging
-        logger.info("Error during StandCloud synchronization")
+    except Exception as exc:  # noqa: BLE001
+        msg = f"Error during StandCloud synchronization. {exc}"
+        logger.info(msg)
         return {"status": msg}
-    logger.info(f"StandCloud sucnronization status: {sync_result}")
+    logger.info(f"StandCloud syncronization status: {sync_result}")
     return {"status": sync_result}
 
 

{hardpy-0.18.0 → hardpy-0.18.2}/hardpy/pytest_hardpy/plugin.py

@@ -140,10 +140,10 @@ class HardpyPlugin:
         self._start_args = {}
         self._sc_syncronizer = StandCloudSynchronizer()
 
-        if system() == "Linux":
-            signal.signal(signal.SIGTERM, self._stop_handler)
-        elif system() == "Windows":
+        if system() == "Windows":
             signal.signal(signal.SIGBREAK, self._stop_handler)  # type: ignore
+        else:
+            signal.signal(signal.SIGTERM, self._stop_handler)
         self._log = getLogger(__name__)
 
     # Initialization hooks

{hardpy-0.18.0 → hardpy-0.18.2}/hardpy/pytest_hardpy/pytest_wrapper.py

@@ -65,7 +65,7 @@ class PyTestWrapper:
                 cwd=self._config_manager.tests_path,
                 creationflags=subprocess.CREATE_NEW_PROCESS_GROUP,
             )
-        if system() == "Linux":
+        else:
             self._proc = subprocess.Popen(  # noqa: S603
                 cmd,
                 cwd=self._config_manager.tests_path,
@@ -80,10 +80,10 @@ class PyTestWrapper:
             bool: True if pytest was running and stopped
         """
         if self.is_running() and self._proc:
-            if system() == "Linux":
-                self._proc.terminate()
-            elif system() == "Windows":
+            if system() == "Windows":
                 self._proc.send_signal(signal.CTRL_BREAK_EVENT)  # type: ignore
+            else:
+                self._proc.terminate()
             return True
         return False
 

{hardpy-0.18.0 → hardpy-0.18.2}/hardpy/pytest_hardpy/result/report_synchronizer/synchronizer.py

@@ -31,10 +31,7 @@ class StandCloudSynchronizer:
         """
         if not self._tempstore.reports():
             return "All reports are synchronized with StandCloud"
-        try:
-            loader = self._create_sc_loader()
-        except StandCloudError as err:
-            raise StandCloudError(str(err)) from err
+        loader = self._create_sc_loader()
 
         invalid_reports = []
         success_report_counter = 0
@@ -117,5 +114,13 @@ class StandCloudSynchronizer:
 
     def _create_sc_loader(self) -> StandCloudLoader:
         loader = StandCloudLoader()
-        loader.healthcheck()
+        response = loader.healthcheck()
+        if response.status_code != HTTPStatus.OK:
+            url = response.url
+            code = response.status_code
+            msg = f"StandCloud healthcheck at {url} is unavailable, status code: {code}"
+            raise StandCloudError(msg)
+        if response.status_code == HTTPStatus.OK and response.text != "{}":
+            msg = f"StandCloud healthcheck at {response.url} is unavailable"
+            raise StandCloudError(msg)
         return loader

{hardpy-0.18.0 → hardpy-0.18.2}/pyproject.toml

@@ -3,7 +3,7 @@
 
 [project]
     name = "hardpy"
-    version = "0.18.0"
+    version = "0.18.2"
     description = "HardPy library for device testing"
     license = "GPL-3.0-or-later"
     authors = [{ name = "Everypin", email = "info@everypin.io" }]