resolve rebase errors

src/charm.py

@@ -131,10 +131,10 @@ def _run_sql_migration(self) -> bool:
 
         Returns True if migration was run successfully, else returns false.
         """
+        try:
             process = self._container.exec(
                 ["kratos", "migrate", "sql", "-e", "--config", self._config_file_path, "--yes"],
             )
-        try:
             stdout, _ = process.wait_output()
             logger.info(f"Successfully executed automigration: {stdout}")
         except ExecError as err:

tests/unit/conftest.py

@@ -32,6 +32,7 @@ def mocked_fqdn(mocker):
     return mocked_fqdn
 
 
+@pytest.fixture()
 def mocked_pebble_exec(mocker):
     mocked_pebble_exec = mocker.patch("ops.model.Container.exec")
     yield mocked_pebble_exec

tests/unit/test_charm.py

@@ -256,12 +256,7 @@ def test_on_database_changed_when_pebble_is_ready(harness, mocked_pebble_exec_su
 
 
 @pytest.mark.parametrize("api_type,port", [("admin", "4434"), ("public", "4433")])
-def test_ingress_relation_created(
-    harness, mocked_kubernetes_service_patcher, mocked_fqdn, api_type, port
-) -> None:
-    harness.begin()
-    harness.set_can_connect(CONTAINER_NAME, True)
-
+def test_ingress_relation_created(harness, mocked_fqdn, api_type, port) -> None:
     relation_id = setup_ingress_relation(harness, api_type)
     app_data = harness.get_relation_data(relation_id, harness.charm.app)