From e3a93a0b0b33889309ef0e25277653c487f46095 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gw=C3=A9na=C3=ABl=20Rault?= <gwenael@cartoway.com>
Date: Mon, 22 Sep 2025 15:04:56 +0200
Subject: [PATCH 1/4] Fix asynchronous tests

---
 test/api/v01/helpers/request_helper.rb | 32 +-------------------------
 1 file changed, 1 insertion(+), 31 deletions(-)

diff --git a/test/api/v01/helpers/request_helper.rb b/test/api/v01/helpers/request_helper.rb
index 267e9c10..a8f9585d 100644
--- a/test/api/v01/helpers/request_helper.rb
+++ b/test/api/v01/helpers/request_helper.rb
@@ -150,44 +150,14 @@ def delete_completed_job(job_id, params)
     JSON.parse(last_response.body)
   end
 
-  def asynchronously(options = {start_worker: false})
+  def asynchronously(_options = {start_worker: false})
     old_config_solve_synchronously = OptimizerWrapper.config[:solve][:synchronously]
     OptimizerWrapper.config[:solve][:synchronously] = false
     old_resque_inline = Resque.inline
     Resque.inline = false
-    if options[:start_worker] && !ENV['DOCKER']
-      pid_worker = Process.spawn({ 'COUNT' => '1', 'QUEUE' => 'DEFAULT' },
-                                 'bundle exec rake resque:workers --trace', pgroup: true) # don't create another shell
-      pgid_worker = Process.getpgid(pid_worker)
-      while `ps -o pgid | grep #{pgid_worker}`.split(/\n/).size < 2
-        puts "#{Time.now} Waiting for the worker to launch"
-        sleep 0.1
-      end
-      puts "#{Time.now} Worker is started"
-      sleep 0.1
-    end
     yield
   ensure
     Resque.inline = old_resque_inline
     OptimizerWrapper.config[:solve][:synchronously] = old_config_solve_synchronously
-    if options[:start_worker] && !ENV['DOCKER'] && pgid_worker
-      # Kill all grandchildren
-      worker_pids = `ps -o pgid,pid | grep #{pgid_worker}`.split(/\n/)
-      worker_pids.collect!{ |i| i.split(' ')[-1].to_i }
-      worker_pids.sort!
-      worker_pids.reverse_each{ |pid|
-        next if pid == pgid_worker
-
-        Process.kill('SIGKILL', pid)
-        Process.detach(pid)
-      }
-      Process.kill('SIGTERM', -pgid_worker) # Kill the process group (this doesn't kill grandchildren)
-      Process.waitpid(-pgid_worker, 0)
-      while `ps -o pgid,pid | grep "#{worker_pids.join('\|')}"`.split(/\n/).any?
-        puts "#{Time.now} Waiting the worker process group #{pgid_worker} to die\n"
-        sleep 0.1
-      end
-      puts "#{Time.now} Worker is killed"
-    end
   end
 end

From b8529a53244513776159f1fb6580a0043b8de613 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gw=C3=A9na=C3=ABl=20Rault?= <gwenael@cartoway.com>
Date: Wed, 24 Sep 2025 08:35:31 +0200
Subject: [PATCH 2/4] define redis port

---
 docker/docker-compose.test.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docker/docker-compose.test.yml b/docker/docker-compose.test.yml
index a4ae69c6..0e011ba8 100644
--- a/docker/docker-compose.test.yml
+++ b/docker/docker-compose.test.yml
@@ -40,6 +40,8 @@ services:
       interval: 30s
       timeout: 10s
       retries: 5
+    ports:
+      - 6379:6379
 
   # redis-cache:
   #   image: redis:${REDIS_VERSION:-7-alpine}

From e15d6d75ca7fbdde9bf319e701184715bf4bc223 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gw=C3=A9na=C3=ABl=20Rault?= <gwenael@cartoway.com>
Date: Wed, 24 Sep 2025 08:54:22 +0200
Subject: [PATCH 3/4] CI depends_on redis healthy

---
 docker/docker-compose.test.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docker/docker-compose.test.yml b/docker/docker-compose.test.yml
index 0e011ba8..e5b91f2b 100644
--- a/docker/docker-compose.test.yml
+++ b/docker/docker-compose.test.yml
@@ -10,7 +10,8 @@ x-default-service: &default-service
     REDIS_RESQUE_HOST: redis-resque
     REDIS_RESULT_TTL_DAYS: ${REDIS_RESULT_TTL_DAYS:-1}
   depends_on:
-    - redis-resque
+    redis-resque:
+      condition: service_healthy
     # - redis-cache
 
 services:

From d5265bd6d451779b3f8eafd3a9251a19771b94ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gw=C3=A9na=C3=ABl=20Rault?= <gwenael@cartoway.com>
Date: Wed, 24 Sep 2025 09:19:21 +0200
Subject: [PATCH 4/4] Try

---
 docker/docker-compose.test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/docker-compose.test.yml b/docker/docker-compose.test.yml
index e5b91f2b..c4aadc08 100644
--- a/docker/docker-compose.test.yml
+++ b/docker/docker-compose.test.yml
@@ -7,7 +7,7 @@ x-default-service: &default-service
     OPTIM_DEFAULT_MAX_LATENESS_RATIO: 1
     OPTIM_GENERATE_GEOJSON_POLYLINES: 'true'
     # REDIS_CACHE_HOST: redis-cache
-    REDIS_RESQUE_HOST: redis-resque
+    REDIS_RESQUE_HOST: localhost
     REDIS_RESULT_TTL_DAYS: ${REDIS_RESULT_TTL_DAYS:-1}
   depends_on:
     redis-resque: