Fixing flaky tests

Since I changed the CI jobs, several tests have been failing; One of
them was failing because it was testing the wrong thing, let's see if
this helps.

I also updated the formatting deps so they're coming from the right project

Author: scohen

apps/common/.formatter.exs

@@ -1,18 +1,9 @@
 # Used by "mix format"
-eventual_assertions = [
-  assert_eventually: 1,
-  assert_eventually: 2,
-  refute_eventually: 1,
-  refute_eventually: 2
-]
-
 [
   inputs: [
     "{mix,.formatter}.exs",
     "{config,test}/**/*.{ex,exs}",
     "lib/lexical/**/*.{ex,ex}",
     "lib/mix/**/*.{ex,exs}"
-  ],
-  locals_without_parens: eventual_assertions,
-  export: [locals_without_parens: eventual_assertions]
+  ]
 ]

apps/plugin_runner/.formatter.exs

@@ -1,4 +1,5 @@
 # Used by "mix format"
 [
-  inputs: ["{mix,.formatter}.exs", "{config,lib,test}/**/*.{ex,exs}"]
+  inputs: ["{mix,.formatter}.exs", "{config,lib,test}/**/*.{ex,exs}"],
+  import_deps: [:lexical_test]
 ]

apps/plugin_runner/mix.exs

@@ -28,7 +28,9 @@ defmodule Lexical.Plugin.Runner.MixProject do
   defp deps do
     [
       {:common, in_umbrella: true},
-      {:lexical_plugin, path: "../../projects/lexical_plugin", only: :test}
+      {:lexical_plugin, path: "../../projects/lexical_plugin", only: :test},
+      {:lexical_test, path: "../../projects/lexical_test", only: :test},
+      {:patch, "~> 0.12", only: :test}
     ]
   end
 

apps/plugin_runner/test/lexical/plugin/runner/coordinator/state_test.exs

@@ -128,7 +128,7 @@ defmodule Lexical.Plugin.Coordinator.StateTest do
       assert State.failure_count(state, BadReturn) == 1
     end
 
-    test "a plugin is disabled if it fails 3 times", %{state: state} do
+    test "a plugin is disabled if it fails 10 times", %{state: state} do
       Runner.register(Crashes)
 
       assert :crashes in Runner.enabled_plugins()

apps/plugin_runner/test/lexical/plugin/runner/coordinator_test.exs

@@ -4,6 +4,7 @@ defmodule Lexical.Runner.CoordinatorTest do
   alias Lexical.Project
 
   use ExUnit.Case
+  import Lexical.Test.EventualAssertions
 
   setup do
     {:ok, _} = start_supervised(Runner.Supervisor)
@@ -113,6 +114,7 @@ defmodule Lexical.Runner.CoordinatorTest do
     defp make_it_crash do
       for _ <- 1..10 do
         Runner.diagnose(%Document{}, notifier())
+        assert_receive _
       end
     end
 
@@ -121,6 +123,7 @@ defmodule Lexical.Runner.CoordinatorTest do
 
       old_pid = Process.whereis(Runner.Coordinator)
       assert :exits in Runner.enabled_plugins()
+
       Runner.diagnose(%Document{}, notifier())
 
       assert_receive [], 500
@@ -135,11 +138,7 @@ defmodule Lexical.Runner.CoordinatorTest do
 
       make_it_crash()
 
-      assert_receive [], 500
-      assert_receive [], 500
-      assert_receive [], 500
-
-      refute :crashy in Runner.enabled_plugins()
+      refute_eventually(:crashy in Runner.enabled_plugins())
     end
 
     test "slow plugins are disabled" do
@@ -149,11 +148,7 @@ defmodule Lexical.Runner.CoordinatorTest do
 
       make_it_crash()
 
-      assert_receive []
-      assert_receive []
-      assert_receive []
-
-      refute :slow in Runner.enabled_plugins()
+      refute_eventually(:slow in Runner.enabled_plugins())
     end
 
     test "plugins that don't return lists are disabled" do
@@ -163,11 +158,7 @@ defmodule Lexical.Runner.CoordinatorTest do
 
       make_it_crash()
 
-      assert_receive [], 500
-      assert_receive [], 500
-      assert_receive [], 500
-
-      refute :bad_return in Runner.enabled_plugins()
+      refute_eventually(:bad_return in Runner.enabled_plugins())
     end
   end
 end

apps/server/.formatter.exs

@@ -1,9 +1,9 @@
 # Used by "mix format"
 imported_deps =
   if Mix.env() == :test do
-    [:patch, :common]
+    [:patch, :lexical_test]
   else
-    [:common]
+    [:lexical_test]
   end
 
 locals_without_parens = [with_progress: 3]

hooks/pre-commit

@@ -1,2 +1,2 @@
 #! /usr/bin/env bash
-mix do format --check-formatted, credo
+MIX_ENV=test mix do format --check-formatted, credo

projects/lexical_test/.formatter.exs

@@ -1,4 +1,12 @@
 # Used by "mix format"
 [
-  inputs: ["{mix,.formatter}.exs", "{config,lib,test}/**/*.{ex,exs}"]
+  inputs: ["{mix,.formatter}.exs", "{config,lib,test}/**/*.{ex,exs}"],
+  export: [
+    locals_without_parens: [
+      assert_eventually: 1,
+      assert_eventually: 2,
+      refute_eventually: 1,
+      refute_eventually: 2
+    ]
+  ]
 ]