VIP - change test position

mishka-group · May 19, 2024 · 03e8b49 · 03e8b49
1 parent 624e2e6
commit 03e8b49
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 33 deletions.
diff --git a/lib/processing_pipelines/queue/job.ex b/lib/processing_pipelines/queue/job.ex
@@ -370,7 +370,7 @@ defmodule MishkaInstaller.ProcessingPipelines.Queue.Job do
             pid
           )
 
-        job_broadcast(worker, "terminate", nil)
+        job_broadcast(worker, "terminate", result)
         result
 
       nil ->

diff --git a/test/processing_pipelines/queue/queue_test.exs b/test/processing_pipelines/queue/queue_test.exs
@@ -284,6 +284,33 @@ defmodule MishkaInstallerTest.ProcessingPipelines.Queue.QueueTest do
     {:error, :not_found} = assert Job.terminate(pid)
   end
 
+  test "Stop and backup a job" do
+    MnesiaAssistant.subscribe({:table, Queue, :detailed})
+    queued = [%{entries: [fullname: "test1", role: "admin"]}]
+    {:ok, _data} = assert Queue.new(%{worker: WorkerThree, queued: queued})
+    {:ok, _data1} = assert Queue.stop(worker: WorkerThree)
+    assert_receive %{status: "terminate"}
+
+    assert_receive {
+      :mnesia_table_event,
+      {:delete, Queue, {MishkaInstaller.ProcessingPipelines.Queue.Queue, _}, [], _}
+    }
+  end
+
+  test "Full stop and full backup a job" do
+    Queue.drop()
+    MnesiaAssistant.subscribe({:table, Queue, :detailed})
+    queued = [%{entries: [fullname: "test1", role: "admin"]}]
+    {:ok, _data} = assert Queue.new(%{worker: WorkerThree, queued: queued})
+    {:ok, _data1} = assert Queue.full_stop(worker: WorkerThree)
+    assert_receive %{status: "terminate"}
+
+    assert_receive {
+      :mnesia_table_event,
+      {:delete, Queue, {MishkaInstaller.ProcessingPipelines.Queue.Queue, _}, [], _}
+    }
+  end
+
   test "Halt a put queue request and run their Process" do
     MnesiaAssistant.subscribe({:table, Queue, :detailed})
 
@@ -305,38 +332,6 @@ defmodule MishkaInstallerTest.ProcessingPipelines.Queue.QueueTest do
     assert_receive %{status: "halt", worker: WorkerTwo}, 2000
   end
 
-  # TODO: Terminate testing, sometimes work sometimes breaks the test
-  # test "Stop and backup a job" do
-  #   MnesiaAssistant.subscribe({:table, Queue, :detailed})
-  #   queued = [%{entries: [fullname: "test1", role: "admin"]}]
-  #   {:ok, data} = assert Queue.new(%{worker: WorkerThree, queued: queued})
-  #   [{_pid, nil}] = assert Job.find_worker_pid(data.worker)
-  #   {:ok, data} = assert Queue.stop(worker: WorkerThree)
-  #   assert_receive %{status: "terminate"}
-  #   Job.find_worker_pid(data.worker)
-
-  #   assert_receive {
-  #     :mnesia_table_event,
-  #     {:delete, Queue, {MishkaInstaller.ProcessingPipelines.Queue.Queue, _}, [], _}
-  #   }
-  # end
-
-  # test "Full stop and full backup a job" do
-  #   Queue.drop()
-  #   MnesiaAssistant.subscribe({:table, Queue, :detailed})
-  #   queued = [%{entries: [fullname: "test1", role: "admin"]}]
-  #   {:ok, data} = assert Queue.new(%{worker: WorkerThree, queued: queued})
-  #   [{_pid, nil}] = assert Job.find_worker_pid(data.worker)
-  #   {:ok, data} = assert Queue.full_stop(worker: WorkerThree)
-  #   assert_receive %{status: "terminate"}
-  #   Job.find_worker_pid(data.worker)
-
-  #   assert_receive {
-  #     :mnesia_table_event,
-  #     {:delete, Queue, {MishkaInstaller.ProcessingPipelines.Queue.Queue, _}, [], _}
-  #   }
-  # end
-
   ####################################################################################
   ########################## (▰˘◡˘▰) Helper (▰˘◡˘▰) ############################
   ####################################################################################