fix(tests)

Signed-off-by: Marcel Klehr <mklehr@gmx.net>

Author: marcelklehr

.github/workflows/integration-test.yml

@@ -818,13 +818,13 @@ jobs:
           ./occ background-job:worker 'OC\TaskProcessing\SynchronousBackgroundJob' &
           # Check for user admin: Should be there
           OUT_ADMIN_ENGLISH_PROMPT_AI=$(./occ context_chat:prompt admin "Which factors are taken into account for the Ethical AI Rating?")
-          OUT_ADMIN_ENGLISH_PROMPT_AI=$(./occ context_chat:prompt admin "Welche Faktoren beeinflussen das Ethical AI Rating?")
+          OUT_ADMIN_GERMAN_PROMPT_AI=$(./occ context_chat:prompt admin "Welche Faktoren beeinflussen das Ethical AI Rating?")
           OUT_ADMIN_SEARCH_AI=$(./occ context_chat:search admin "Welche Faktoren beeinflussen das Ethical AI Rating?")
           
           # Check for user test: Shouldn't be there
-          OUT_TEST_ENGLISH_PROMPT_AI=$(./occ context_chat:prompt test "Which factors are taken into account for the Ethical AI Rating?")
-          OUT_TEST_GERMAN_PROMPT_AI=$(./occ context_chat:prompt test "Welche Faktoren beeinflussen das Ethical AI Rating?")
-          OUT_TEST_SEARCH_AI=$(./occ context_chat:search test "Welche Faktoren beeinflussen das Ethical AI Rating?")
+          OUT_TEST_ENGLISH_PROMPT_AI=$(./occ context_chat:prompt test "Which factors are taken into account for the Ethical AI Rating?" || echo '')
+          OUT_TEST_GERMAN_PROMPT_AI=$(./occ context_chat:prompt test "Welche Faktoren beeinflussen das Ethical AI Rating?" || echo '')
+          OUT_TEST_SEARCH_AI=$(./occ context_chat:search test "Welche Faktoren beeinflussen das Ethical AI Rating?" || echo '')
           
           # Check for user test: Should be there, because it was shared
           OUT_TEST_PROMPT_JOBS=$(./occ context_chat:prompt test "How do I set my TimedJob to be time insensitive?")
@@ -833,7 +833,7 @@ jobs:
           set -x
           
           echo "$OUT_ADMIN_ENGLISH_PROMPT_AI"
-          echo "$OUT_ADMIN_ENGLISH_PROMPT_AI"
+          echo "$OUT_ADMIN_GERMAN_PROMPT_AI"
           echo "$OUT_ADMIN_SEARCH_AI"
           echo "$OUT_TEST_ENGLISH_PROMPT_AI"
           echo "$OUT_TEST_GERMAN_PROMPT_AI"
@@ -844,7 +844,7 @@ jobs:
           set +x
           
           echo "$OUT_ADMIN_ENGLISH_PROMPT_AI" | grep -q -v "If all of these points are met, we give a Green label." && echo 'Admin does not see AI overview anymore' || exit 1
-          echo "$OUT_ADMIN_ENGLISH_PROMPT_AI" | grep -q -v "If all of these points are met, we give a Green label." && echo 'Admin does not see AI overview anymore, after german question' || exit 1
+          echo "$OUT_ADMIN_GERMAN_PROMPT_AI" | grep -q -v "If all of these points are met, we give a Green label." && echo 'Admin does not see AI overview anymore, after german question' || exit 1
           echo "$OUT_ADMIN_SEARCH_AI" | grep -q -v "overview.rst" && echo 'Admin does not see AI overview anymore, when using search' || exit 1
           echo "$OUT_TEST_ENGLISH_PROMPT_AI" | grep -q -v "If all of these points are met, we give a Green label." && echo 'Test user does not see AI overview' || exit 1
           echo "$OUT_TEST_GERMAN_PROMPT_AI" | grep -q -v "If all of these points are met, we give a Green label." && echo 'Test user does not see AI overview, after german question' || exit 1

lib/BackgroundJobs/FileSystemListenerJob.php

@@ -83,19 +83,19 @@ protected function run($argument): void {
 				}
 
 				try {
-					try {
-						switch ($fsEvent->getTypeObject()) {
-							case FsEventType::CREATE:
-								$this->fsEventService->onInsert($node);
-								break;
-							case FsEventType::ACCESS_UPDATE_DECL:
-								$this->fsEventService->onAccessUpdateDecl($node);
-								break;
-						}
-						$this->diagnosticService->sendHeartbeat(static::class, $this->getId());
-					} catch (\RuntimeException $e) {
-						$this->logger->warning('Error handling fs event "' . $fsEvent->getType() . '": ' . $e->getMessage(), ['exception' => $e]);
+					switch ($fsEvent->getTypeObject()) {
+						case FsEventType::CREATE:
+							$this->fsEventService->onInsert($node);
+							break;
+						case FsEventType::ACCESS_UPDATE_DECL:
+							$this->fsEventService->onAccessUpdateDecl($node);
+							break;
 					}
+					$this->diagnosticService->sendHeartbeat(static::class, $this->getId());
+				} catch (\Throwable $e) {
+					$this->logger->warning('Error handling fs event "' . $fsEvent->getType() . '": ' . $e->getMessage(), ['exception' => $e]);
+				}
+				try {
 					$this->fsEventMapper->delete($fsEvent);
 				} catch (Exception $e) {
 					$this->logger->warning('Error deleting fs event "' . $fsEvent->getType() . '": ' . $e->getMessage(), ['exception' => $e]);