hardpy 0.18.0__py3-none-any.whl → 0.18.2__py3-none-any.whl

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/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/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/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/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/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/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/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.dist-info → hardpy-0.18.2.dist-info}/METADATA

@@ -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.dist-info → hardpy-0.18.2.dist-info}/RECORD

@@ -1,19 +1,19 @@
 hardpy/__init__.py,sha256=B99MElYhd8HHgOJaT-RVPyvIN18uPaG2pb78TJ3lqvE,2957
 hardpy/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-hardpy/cli/cli.py,sha256=L-yFMcMTm3JY3s1eK83q5sHxrF8altU8rhrwSF9VNG8,11195
+hardpy/cli/cli.py,sha256=eg89XAcPSosykXyeWitcTigE-ZYiDeCknPWp9TpXxeA,11359
 hardpy/cli/template.py,sha256=kOl8hsj6iBTFIDUli_dzHkH8mlnoJzOlr9muLpTEayg,6230
 hardpy/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hardpy/common/config.py,sha256=t1ij_-PiIuhIgXD0PP2fZeRJF-gQGGxthYsu1PQmDGQ,6430
 hardpy/common/singleton.py,sha256=RVMqbluN-mhlJ4QOYcRzQLA68Hs8t83XNyihyUwhYGo,948
 hardpy/common/stand_cloud/__init__.py,sha256=fezdiYAehtT2H-GAef-xZU12CbmCRe64XHA9UB3kJDU,456
-hardpy/common/stand_cloud/connector.py,sha256=OegkuPH8Vxo_cWjiNRHzY4ONmDGWzZbz8K7Y_WeCgUc,8135
-hardpy/common/stand_cloud/exception.py,sha256=eKkqu5ylDRIGN_yZhvz2xVGm49XmlZ8nryALgdRqpbY,287
+hardpy/common/stand_cloud/connector.py,sha256=PD1Gr1QOuFUmCsnlPY2zb_WF9Nrr8BGTlbRC2_LTKFE,8147
+hardpy/common/stand_cloud/exception.py,sha256=zzFlW3Pg8ihG7t-Fb-KvfhDIE5l6oAg9Pdghse8Ib4U,191
 hardpy/common/stand_cloud/oauth2.py,sha256=SDqtIwcuMgqfBkEZyo3GXeVPnvRBOr6dzeXowx3ZkEw,2803
 hardpy/common/stand_cloud/registration.py,sha256=UW-JGcvON5CMQQ-s2Mb4Ee3u_jmdQfSj3vPfZ_FuhHY,2370
-hardpy/common/stand_cloud/token_manager.py,sha256=0s4fdYrjAonv1DCzTE5D-fF6drZJ3AhTDUoCRlSlK68,4730
+hardpy/common/stand_cloud/token_manager.py,sha256=oHLDip0a-0mmAiRQN5IuypTSNyOnSB43TSWlprOLRI0,4843
 hardpy/common/stand_cloud/utils.py,sha256=GN3wzbrmF-Xe5iUXf_HurGO-YKltqd3Gc_7vG2eEL7c,692
 hardpy/hardpy_panel/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-hardpy/hardpy_panel/api.py,sha256=3zNdXldYGXSnf7bwE-oqoI8xE0H1shwOWg3_bkUGCvs,8149
+hardpy/hardpy_panel/api.py,sha256=KNT4z5WNgpOjujAtBSmrPXsDmA5hUJKVeLZ6Ah9u_nk,8007
 hardpy/hardpy_panel/frontend/dist/favicon.ico,sha256=sgIk5PKUKEKBDpkSrc8dJgjpObp0iF82Mec0GpfKId4,15406
 hardpy/hardpy_panel/frontend/dist/index.html,sha256=TOZiLD7WXiBB5W0GPF50u5zQtG0-gQ4Gd7n2757k-hU,1851
 hardpy/hardpy_panel/frontend/dist/logo192.png,sha256=E4K7drvhJCg9HcTpRihOXZhVJVBZ7-W97Se-3tDb46o,14485
@@ -46,9 +46,9 @@ hardpy/hardpy_panel/frontend/dist/locales/ja/translation.json,sha256=kGBJmHlhndu
 hardpy/hardpy_panel/frontend/dist/locales/ru/translation.json,sha256=81pqFajGhSwPwZV4j0HpziB1oX2iJ5Ud12cLiAaX8J0,3467
 hardpy/hardpy_panel/frontend/dist/locales/zh/translation.json,sha256=9W61N2MA15J5Zj6UqBqPmUDZXaRAH2HWm9m51BgvzJw,2322
 hardpy/pytest_hardpy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-hardpy/pytest_hardpy/plugin.py,sha256=6If9k_gyXYH2Eow0d5ty2Kpb3Qsij17gb3DlqIXauWQ,23355
+hardpy/pytest_hardpy/plugin.py,sha256=RqBZeIjdrV7szq0tShjqq6TkpWWBhzQN89KcCHSYhEo,23335
 hardpy/pytest_hardpy/pytest_call.py,sha256=qUDrK1iUjhGEs4bmBFTk9E0YfFzsePoHhVDRY6ngRV8,22878
-hardpy/pytest_hardpy/pytest_wrapper.py,sha256=bbk1BYy7CEBeg3Z2pcONb-xFzb3uDYLKcJV7316-Szo,4830
+hardpy/pytest_hardpy/pytest_wrapper.py,sha256=U-tguwJsyW_lDAbFcEOgutc6G__PmWnhuHA6fCgePUc,4792
 hardpy/pytest_hardpy/db/__init__.py,sha256=nat_tUO2cxPIp9e6U8Fvg6V4NcZ9TVg27u0GHoKelD4,865
 hardpy/pytest_hardpy/db/base_store.py,sha256=d1lkTB7CpHTKysD2yuuGQFai44OtOmtTbq-WaBYojhw,5545
 hardpy/pytest_hardpy/db/const.py,sha256=E_A0IKGeS3qyPX4fTfUE5ksARsrTKSVWqUkdmh8S_fo,1414
@@ -71,7 +71,7 @@ hardpy/pytest_hardpy/result/report_reader/__init__.py,sha256=47DEQpj8HBSa-_TImW-
 hardpy/pytest_hardpy/result/report_reader/couchdb_reader.py,sha256=lnWSX-0QKbdMwtqfCtW0tiH9W_ZEPqQ3rb7Lc8gES7E,5726
 hardpy/pytest_hardpy/result/report_reader/stand_cloud_reader.py,sha256=uT7YSBu1QyURH9IkgRCdpbinn8LKXUhgVEhwPmGZV7I,3636
 hardpy/pytest_hardpy/result/report_synchronizer/__init__.py,sha256=QezaT_Yk8LrciygdsFPJeZn0EBUaKpd0GfCQjSuIo-I,273
-hardpy/pytest_hardpy/result/report_synchronizer/synchronizer.py,sha256=-RnYMhnZTDci0NniwnCoG5-Pg-R22TKWQLfyfTgyA_w,4309
+hardpy/pytest_hardpy/result/report_synchronizer/synchronizer.py,sha256=c27we42R9OOlTnN8T0Zw_PRVxg4RNabug9PEq9Y9lNE,4652
 hardpy/pytest_hardpy/utils/__init__.py,sha256=zHln8ySBHesYAwYatLYkHol5TuuTTNOqrsMP7ONFEG0,1338
 hardpy/pytest_hardpy/utils/const.py,sha256=xS3jBrW_D6IUTlAjSnLiHvSthieRHCj3uN_6fFAXS0w,1832
 hardpy/pytest_hardpy/utils/dialog_box.py,sha256=eCLGQ-Z8rDPd_8ABHRtbkd7piSZcJoG-bCBmnyq29Pw,11375
@@ -79,8 +79,8 @@ hardpy/pytest_hardpy/utils/exception.py,sha256=1l2VBZLUnjPDoOs744MtaP7Y9FuXUq7ko
 hardpy/pytest_hardpy/utils/machineid.py,sha256=6JAzUt7KtjTYn8kL9hSMaCQ20U8liH-zDT9v-5Ch7Q8,296
 hardpy/pytest_hardpy/utils/node_info.py,sha256=DaW566WvsyWR66CThuZ38UoHwQa-pu-4WRLg61OXDnE,7134
 hardpy/pytest_hardpy/utils/progress_calculator.py,sha256=TPl2gG0ZSvMe8otPythhF9hkD6fa6-mJAhy9yI83-yE,1071
-hardpy-0.18.0.dist-info/METADATA,sha256=sZ2hohzC2kZlfrBnO5j3IjoJkfiSeElIsDjra0G2fQs,4983
-hardpy-0.18.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-hardpy-0.18.0.dist-info/entry_points.txt,sha256=nL2sMkKMScNaOE0IPkYnu9Yr-BUswZvGSrwY-SxHY3E,102
-hardpy-0.18.0.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-hardpy-0.18.0.dist-info/RECORD,,
+hardpy-0.18.2.dist-info/METADATA,sha256=rIRCy0Wuyu1GRnE9NMm7kQY3CZvef_hP6XInfN28Shk,4983
+hardpy-0.18.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+hardpy-0.18.2.dist-info/entry_points.txt,sha256=nL2sMkKMScNaOE0IPkYnu9Yr-BUswZvGSrwY-SxHY3E,102
+hardpy-0.18.2.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+hardpy-0.18.2.dist-info/RECORD,,