Merge pull request #40 from livestreamx/fix-cringe

FIX CRINGE

Author: artamaney

overhave/admin/views/emulation.py

@@ -80,14 +80,14 @@ def edit_view(self) -> werkzeug.Response | None:
             return rendered
 
         test_user_id = data["test_user"]
-        if not self._ensure_no_active_emulation_runs_for_user(int(test_user_id)):
+        if self._ensure_has_active_emulation_runs_for_user(int(test_user_id)):
             flask.flash(f"Unable to run new emulation in parallel for user {test_user_id}")
             return rendered
 
         logger.debug("Seen emulation request")
         return self._run_emulation(emulation_id)
 
     @staticmethod
-    def _ensure_no_active_emulation_runs_for_user(test_user_id: int) -> bool:
+    def _ensure_has_active_emulation_runs_for_user(test_user_id: int) -> bool:
         factory = get_admin_factory()
         return factory.emulation_storage.has_running_emulation_with_user(test_user_id)

overhave/admin/views/scenario_test_run.py

@@ -71,15 +71,11 @@ def on_model_delete(self, model: db.TestRun) -> None:
 
     @staticmethod
     def _run_test(rendered: werkzeug.Response) -> werkzeug.Response:
-        current_test_run_id = get_mdict_item_or_list(flask.request.args, "id")
+        current_scenario_id = int(get_mdict_item_or_list(flask.request.args, "id"))
         factory = get_admin_factory()
-
-        with db.create_session() as session:
-            scenario_id = (
-                session.query(db.TestRun.scenario_id).filter(db.TestRun.id == current_test_run_id).one().scenario_id
-            )
-
-        test_run_id = factory.test_run_storage.create_testrun(scenario_id=scenario_id, executed_by=current_user.login)
+        test_run_id = factory.test_run_storage.create_testrun(
+            scenario_id=current_scenario_id, executed_by=current_user.login
+        )
 
         if not factory.context.admin_settings.consumer_based:
             proxy_manager = get_proxy_manager()

overhave/transport/ldap/authenticator.py

@@ -22,7 +22,7 @@ def _connect(self, login: str, password: SecretStr) -> None:
         ldap_connection.set_option(ldap.OPT_REFERRALS, 0)
         ldap_connection.set_option(ldap.OPT_NETWORK_TIMEOUT, self._settings.timeout.seconds)
         if self._settings.tls_enabled:
-            ldap_connection.set_option(ldap.OPT_X_TLS_REQUIRE_CERT, ldap.OPT_X_TLS_REQUIRE_CERT)
+            ldap_connection.set_option(ldap.OPT_X_TLS_REQUIRE_CERT, ldap.OPT_X_TLS_HARD)
             ldap_connection.start_tls_s()
         ldap_connection.simple_bind_s(f"{self._settings.domain}{login}", password.get_secret_value())
         self._ldap_connection = ldap_connection

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "overhave"
-version = "5.1.1"
+version = "5.1.2"
 description = "Overhave - web-framework for BDD"
 readme = "README.rst"
 authors = [