From f6821c4d86f5d37af8f14e54c0449af6d5b4c72a Mon Sep 17 00:00:00 2001
From: Stefan Berggren <nsg@nsg.cc>
Date: Tue, 12 Sep 2023 15:52:12 +0200
Subject: [PATCH] Check and run queues instead of sleeping

This is a much better solution, to actually wait for the processing to
finish before we carry on.
---
 tests/tests_selenium.py | 63 +++++++++++++++++++++--------------------
 1 file changed, 32 insertions(+), 31 deletions(-)

diff --git a/tests/tests_selenium.py b/tests/tests_selenium.py
index 1a33841..a8dcf61 100755
--- a/tests/tests_selenium.py
+++ b/tests/tests_selenium.py
@@ -5,6 +5,7 @@
 import subprocess
 import shutil
 import requests
+import time
 
 from seleniumbase import BaseCase
 BaseCase.main(__name__, __file__)
@@ -37,6 +38,26 @@ def get_assets(filter=[]):
     
     return resp
 
+def get_all_jobs():
+    r = requests.get(f"http://{get_ip_address()}/api/jobs", headers=get_headers())
+    return r.json()
+
+def trigger_job(job_name):
+    r = requests.put(
+        f"http://{get_ip_address()}/api/jobs/{job_name}",
+        headers=get_headers(),
+        json={"command": "start"}
+    )
+    return r.json()
+
+def wait_for_empty_job_queue():
+    for job_name, job_data in get_all_jobs().items():
+        status = job_data['queueStatus']['isActive']
+        if status == True:
+            print(f"Queue {job_name} is running")
+            time.sleep(1)
+            return wait_for_empty_job_queue()
+
 def css_selector_path(element):
     """ Returns a CSS selector that will uniquely select the given element. """
     path = []
@@ -141,57 +162,37 @@ def test_005_upload_assets_with_cli(self):
         
         snap_readable_path = os.path.join(
             os.environ["HOME"],
-            "snap/immich-distribution/current/tests"
+            "snap/immich-distribution/current/"
         )
 
-        if not os.path.exists(snap_readable_path):
-            os.makedirs(snap_readable_path)
-
-        for upload in os.listdir("assets"):
-            shutil.copy(f"assets/{upload}", snap_readable_path)
-
         subprocess.run(
             [
                 "immich-distribution.cli",
                 "upload",
                 "--key", secret,
                 "--yes",
-                snap_readable_path
+                f"{snap_readable_path}/tests"
             ]
         )
 
-        # Give the system time to process the new assets
-        self.sleep(300)
-
-    def test_005_upload_external_assets_with_cli(self):
-        """
-        Use the CLI to upload assets from the external-test-files directory.
-        """
-        secret = get_secret()
-        
-        snap_readable_path = os.path.join(
-            os.environ["HOME"],
-            "snap/immich-distribution/current/tests_external"
-        )
-
-        if not os.path.exists(snap_readable_path):
-            os.makedirs(snap_readable_path)
-
-        for upload in os.listdir("external-test-files"):
-            shutil.copy(f"external-test-files/{upload}", snap_readable_path)
-
         subprocess.run(
             [
                 "immich-distribution.cli",
                 "upload",
                 "--key", secret,
                 "--yes",
-                snap_readable_path
+                f"{snap_readable_path}/tests_external"
             ]
         )
 
-        # Give the system time to process the new assets
-        self.sleep(60)
+        # ML models are downloaded in the background when we upload assets
+        # Wait for them to complete, and the queue to be empty before continuing
+        wait_for_empty_job_queue()
+
+        # Re-run the recognition job. I'm not sure if this is an Immich bug or
+        # just a quirk of the test environment. Anyway let's just run it again.
+        trigger_job("recognizeFaces")
+        wait_for_empty_job_queue()
 
     def test_100_verify_uploaded_assets_number_of_files(self):
         """