pleroma

commit: b281ad06de2de331450a5e319e3ba497071d4197
parent 648e94b369c4a356feda22c0f8ee8a01f7d798f8
Author: Mark Felder <feld@feld.me>
Date:   Tue, 13 Aug 2024 15:34:56 -0400

Revert "Custom mix task to retry failed tests once in CI pipeline"

This reverts commit ed2976b237b53a524247d564691e0a12d3231d68.

Diffstat:
M
.gitlab-ci.yml
2
+-
A
changelog.d/fix-test-failures.skip
0

D
lib/mix/tasks/pleroma/test_runner.ex
25
-------------------------
M
test/mix/tasks/pleroma/uploads_test.exs
2
+-

4 files changed, 2 insertions(+), 27 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -133,7 +133,7 @@ unit-testing-1.13.4-otp-25:
   script: &testing_script
     - mix ecto.create
     - mix ecto.migrate
-    - mix pleroma.test_runner --cover --preload-modules
+    - mix test --cover --preload-modules
   coverage: '/^Line total: ([^ ]*%)$/'
   artifacts:
     reports:
diff --git a/changelog.d/fix-test-failures.skip b/changelog.d/fix-test-failures.skip
diff --git a/lib/mix/tasks/pleroma/test_runner.ex b/lib/mix/tasks/pleroma/test_runner.ex
@@ -1,25 +0,0 @@
-defmodule Mix.Tasks.Pleroma.TestRunner do
-  @shortdoc "Retries tests once if they fail"
-
-  use Mix.Task
-
-  def run(args \\ []) do
-    case System.cmd("mix", ["test"] ++ args, into: IO.stream(:stdio, :line)) do
-      {_, 0} ->
-        :ok
-
-      _ ->
-        retry(args)
-    end
-  end
-
-  def retry(args) do
-    case System.cmd("mix", ["test", "--failed"] ++ args, into: IO.stream(:stdio, :line)) do
-      {_, 0} ->
-        :ok
-
-      _ ->
-        exit(1)
-    end
-  end
-end
diff --git a/test/mix/tasks/pleroma/uploads_test.exs b/test/mix/tasks/pleroma/uploads_test.exs
@@ -58,7 +58,7 @@ defmodule Mix.Tasks.Pleroma.UploadsTest do
     end
   end
 
-  defp prep_uploads() do
+  defp prep_uploads do
     upload_dir = Config.get([Pleroma.Uploaders.Local, :uploads])
 
     if not File.exists?(upload_dir) || File.ls!(upload_dir) == [] do