fix: Fix file listener tests

Signed-off-by: Marcel Klehr <[email protected]>

Author: marcelklehr

tests/ClassifierTest.php

@@ -6,6 +6,7 @@
 use OCA\Recognize\BackgroundJobs\ClassifyMovinetJob;
 use OCA\Recognize\BackgroundJobs\ClassifyMusicnnJob;
 use OCA\Recognize\BackgroundJobs\ClusterFacesJob;
+use OCA\Recognize\BackgroundJobs\ProcessFsActionsJob;
 use OCA\Recognize\BackgroundJobs\SchedulerJob;
 use OCA\Recognize\BackgroundJobs\StorageCrawlJob;
 use OCA\Recognize\Classifiers\Audio\MusicnnClassifier;
@@ -153,37 +154,51 @@ public function testFileListener(string $ignoreFileName) : void {
 		$storageId = $this->testFile->getMountPoint()->getNumericStorageId();
 		$rootId = $this->testFile->getMountPoint()->getStorageRootId();
 
+		$this->runFsActionJobs();
 		self::assertCount(1, $this->queue->getFromQueue(ImagenetClassifier::MODEL_NAME, $storageId, $rootId, 100), 'one element should have been added to imagenet queue');
 
 		$this->testFile->delete();
 
+		$this->runFsActionJobs();
 		self::assertCount(0, $this->queue->getFromQueue(ImagenetClassifier::MODEL_NAME, $storageId, $rootId, 100), 'entry should have been removed from imagenet queue');
 
 		$ignoreFile->delete();
 
+		$this->runFsActionJobs();
 		self::assertCount(1, $this->queue->getFromQueue(ImagenetClassifier::MODEL_NAME, $storageId, $rootId, 100), 'one element should have been added to imagenet queue after deleting ignore file');
 
 		$ignoreFile = $this->userFolder->newFile('/test/' . $ignoreFileName, '');
 
+		$this->runFsActionJobs();
 		self::assertCount(0, $this->queue->getFromQueue(ImagenetClassifier::MODEL_NAME, $storageId, $rootId, 100), 'entry should have been removed from imagenet queue after creating ignore file');
 
 		$this->ignoredFile->move($this->userFolder->getPath() . '/alpine-2.jpg');
 
+		$this->runFsActionJobs();
 		self::assertCount(1, $this->queue->getFromQueue(ImagenetClassifier::MODEL_NAME, $storageId, $rootId, 100), 'one element should have been added to imagenet queue after moving it out of ignored territory');
 
 		$ignoreFile->move($this->userFolder->getPath() . '/' . $ignoreFileName);
 
+		$this->runFsActionJobs();
 		self::assertCount(0, $this->queue->getFromQueue(ImagenetClassifier::MODEL_NAME, $storageId, $rootId, 100), 'entry should have been removed from imagenet queue after moving ignore file');
 
 		$ignoreFile->move($this->userFolder->getPath() . '/test/' . $ignoreFileName);
 
+		$this->runFsActionJobs();
 		self::assertCount(1, $this->queue->getFromQueue(ImagenetClassifier::MODEL_NAME, $storageId, $rootId, 100), 'one element should have been added to imagenet queue after moving ignore file');
 
 		$this->ignoredFile->move($this->userFolder->getPath() . '/test/ignore/alpine-2.jpg');
 
+		$this->runFsActionJobs();
 		self::assertCount(0, $this->queue->getFromQueue(ImagenetClassifier::MODEL_NAME, $storageId, $rootId, 100), 'entry should have been removed from imagenet queue after moving it into ignored territory');
 	}
 
+	private function runFsActionJobs() {
+		while ($job = $this->jobList->getNext(jobClasses:[ProcessFsActionsJob::class])) {
+			$job->start($this->jobList);
+		}
+	}
+
 	/**
 	 * @dataProvider ignoreImageFilesProvider
 	 * @return void
@@ -206,34 +221,42 @@ public function testFileListenerWithFolder(string $ignoreFileName) : void {
 		$storageId = $this->testFile->getMountPoint()->getNumericStorageId();
 		$rootId = $this->testFile->getMountPoint()->getStorageRootId();
 
+		$this->runFsActionJobs();
 		self::assertCount(1, $this->queue->getFromQueue(ImagenetClassifier::MODEL_NAME, $storageId, $rootId, 100), 'one element should have been added to imagenet queue');
 
 		$folder->delete();
 
+		$this->runFsActionJobs();
 		self::assertCount(0, $this->queue->getFromQueue(ImagenetClassifier::MODEL_NAME, $storageId, $rootId, 100), 'entry should have been removed from imagenet queue');
 
 		$ignoreFile->delete();
 
+		$this->runFsActionJobs();
 		self::assertCount(1, $this->queue->getFromQueue(ImagenetClassifier::MODEL_NAME, $storageId, $rootId, 100), 'one element should have been added to imagenet queue after deleting ignore file');
 
 		$ignoreFile = $this->userFolder->newFile('/test/' . $ignoreFileName, '');
 
+		$this->runFsActionJobs();
 		self::assertCount(0, $this->queue->getFromQueue(ImagenetClassifier::MODEL_NAME, $storageId, $rootId, 100), 'entry should have been removed from imagenet queue after creating ignore file');
 
 		$ignoredFolder->move($this->userFolder->getPath() . '/folder2');
 
+		$this->runFsActionJobs();
 		self::assertCount(1, $this->queue->getFromQueue(ImagenetClassifier::MODEL_NAME, $storageId, $rootId, 100), 'one element should have been added to imagenet queue after moving it out of ignored territory');
 
 		$ignoreFile->move($this->userFolder->getPath() . '/' . $ignoreFileName);
 
+		$this->runFsActionJobs();
 		self::assertCount(0, $this->queue->getFromQueue(ImagenetClassifier::MODEL_NAME, $storageId, $rootId, 100), 'entry should have been removed from imagenet queue after moving ignore file');
 
 		$ignoreFile->move($this->userFolder->getPath() . '/test/' . $ignoreFileName);
 
+		$this->runFsActionJobs();
 		self::assertCount(1, $this->queue->getFromQueue(ImagenetClassifier::MODEL_NAME, $storageId, $rootId, 100), 'one element should have been added to imagenet queue after moving ignore file');
 
 		$ignoredFolder->move($this->userFolder->getPath() . '/test/ignore/folder');
 
+		$this->runFsActionJobs();
 		self::assertCount(0, $this->queue->getFromQueue(ImagenetClassifier::MODEL_NAME, $storageId, $rootId, 100), 'entry should have been removed from imagenet queue after moving it into ignored territory');
 	}