Tests

Author: josevalim

lib/mix/lib/mix/tasks/deps.loadpaths.ex

@@ -139,11 +139,7 @@ defmodule Mix.Tasks.Deps.Loadpaths do
   defp partition([dep | deps], not_ok, compile) do
     cond do
       Mix.Dep.compilable?(dep) or (Mix.Dep.ok?(dep) and local?(dep)) ->
-        if from_umbrella?(dep) do
-          partition(deps, not_ok, compile)
-        else
-          partition(deps, not_ok, [dep | compile])
-        end
+        partition(deps, not_ok, [dep | compile])
 
       Mix.Dep.ok?(dep) ->
         partition(deps, not_ok, compile)
@@ -163,11 +159,6 @@ defmodule Mix.Tasks.Deps.Loadpaths do
     |> Mix.Dep.filter_by_name(Mix.Dep.load_and_cache())
   end
 
-  # Those are compiled by umbrella.
-  defp from_umbrella?(dep) do
-    dep.opts[:from_umbrella]
-  end
-
   # Every local dependency (i.e. that are not fetchable)
   # are automatically recompiled if they are ok.
   defp local?(dep) do

lib/mix/test/fixtures/umbrella_dep/mix.exs

@@ -4,6 +4,7 @@ defmodule UmbrellaDep.MixProject do
   def project do
     [
       app: :umbrella_dep,
+      version: "0.1.0",
       deps: deps()
     ]
   end

lib/mix/test/mix/tasks/deps_test.exs

@@ -61,7 +61,7 @@ defmodule Mix.Tasks.DepsTest do
     end
   end
 
-  defmodule RawRepoDep do
+  defmodule RawRepoDepApp do
     def project do
       [
         app: :raw_sample,
@@ -219,6 +219,38 @@ defmodule Mix.Tasks.DepsTest do
     end)
   end
 
+  test "compiles deps using os partitions" do
+    System.put_env("MIX_OS_DEPS_COMPILE_PARTITION_COUNT", "2")
+
+    in_fixture("deps_status", fn ->
+      File.write!("mix.exs", """
+      defmodule ParDepsApp do
+        use Mix.Project
+
+        def project do
+          [
+            app: :par_sample,
+            version: "0.1.0",
+            deps: [
+              {:raw_repo, "0.1.0", path: "custom/raw_repo"},
+              {:git_repo, "0.1.0", path: #{inspect(fixture_path("git_repo"))}}
+            ]
+          ]
+        end
+      end
+      """)
+
+      Mix.Project.in_project(:par_sample, ".", fn _ ->
+        output = ExUnit.CaptureIO.capture_io(fn -> Mix.Tasks.Deps.Compile.run([]) end)
+        assert output =~ ~r/\d> Generated git_repo app/
+        assert output =~ ~r/\d> Generated raw_repo app/
+        assert_received {:mix_shell, :info, ["mix deps.compile running across 2 OS processes"]}
+      end)
+    end)
+  after
+    System.delete_env("MIX_OS_DEPS_COMPILE_PARTITION_COUNT")
+  end
+
   test "doesn't compile any umbrella apps if --skip-umbrella-children is given" do
     in_fixture("umbrella_dep/deps/umbrella", fn ->
       Mix.Project.in_project(:umbrella, ".", fn _ ->
@@ -414,7 +446,7 @@ defmodule Mix.Tasks.DepsTest do
 
   test "sets deps env to prod by default" do
     in_fixture("deps_status", fn ->
-      Mix.Project.push(RawRepoDep)
+      Mix.Project.push(RawRepoDepApp)
 
       Mix.Tasks.Deps.Update.run(["--all"])
       assert_received {:mix_shell, :info, [":raw_repo env is prod"]}
@@ -751,7 +783,7 @@ defmodule Mix.Tasks.DepsTest do
 
   test "checks if compile env changed" do
     in_fixture("deps_status", fn ->
-      Mix.Project.push(RawRepoDep)
+      Mix.Project.push(RawRepoDepApp)
       Mix.Tasks.Deps.Loadpaths.run([])
       assert_receive {:mix_shell, :info, ["Generated raw_repo app"]}
       assert Application.spec(:raw_repo, :vsn)
@@ -766,7 +798,7 @@ defmodule Mix.Tasks.DepsTest do
       Application.unload(:raw_repo)
       Mix.ProjectStack.pop()
       Mix.Task.clear()
-      Mix.Project.push(RawRepoDep)
+      Mix.Project.push(RawRepoDepApp)
       purge([RawRepo])
       Mix.Tasks.Loadconfig.load_compile("config/config.exs")
 

lib/mix/test/mix/umbrella_test.exs

@@ -276,10 +276,27 @@ defmodule Mix.UmbrellaTest do
   test "compile for umbrella as dependency" do
     in_fixture("umbrella_dep", fn ->
       Mix.Project.in_project(:umbrella_dep, ".", fn _ ->
-        Mix.Task.run("deps.compile")
+        Mix.Task.run("compile")
+        assert Bar.bar() == "hello world"
+      end)
+    end)
+  end
+
+  test "compile for umbrella as dependency with os partitions" do
+    System.put_env("MIX_OS_DEPS_COMPILE_PARTITION_COUNT", "2")
+
+    in_fixture("umbrella_dep", fn ->
+      Mix.Project.in_project(:umbrella_dep, ".", fn _ ->
+        output = ExUnit.CaptureIO.capture_io(fn -> Mix.Task.run("compile") end)
+        assert output =~ ~r/\d> :foo env is prod/
+        assert output =~ ~r/\d> :bar env is prod/
+
+        assert_received {:mix_shell, :info, ["mix deps.compile running across 2 OS processes"]}
         assert Bar.bar() == "hello world"
       end)
     end)
+  after
+    System.delete_env("MIX_OS_DEPS_COMPILE_PARTITION_COUNT")
   end
 
   defmodule CycleDeps do
@@ -351,7 +368,7 @@ defmodule Mix.UmbrellaTest do
           def project do
             [app: :bar,
              version: "0.1.0",
-             aliases: ["compile.all": fn _ -> Mix.shell().info "no compile bar" end]]
+             aliases: ["compile.elixir": fn _ -> Mix.shell().info "no compile bar" end]]
           end
         end
         """)

lib/mix/test/test_helper.exs

@@ -10,9 +10,6 @@ mix = Path.expand("../tmp/.mix", __DIR__)
 File.mkdir_p!(mix)
 System.put_env("MIX_HOME", mix)
 
-System.delete_env("XDG_DATA_HOME")
-System.delete_env("XDG_CONFIG_HOME")
-
 # Load protocols to make sure they are not unloaded during tests
 [Collectable, Enumerable, Inspect, String.Chars, List.Chars]
 |> Enum.each(& &1.__protocol__(:module))
@@ -53,12 +50,12 @@ ExUnit.start(
 )
 
 # Clear environment variables that may affect tests
-System.delete_env("http_proxy")
-System.delete_env("https_proxy")
-System.delete_env("HTTP_PROXY")
-System.delete_env("HTTPS_PROXY")
-System.delete_env("MIX_ENV")
-System.delete_env("MIX_TARGET")
+Enum.each(
+  ~w(http_proxy https_proxy HTTP_PROXY HTTPS_PROXY) ++
+    ~w(MIX_ENV MIX_OS_DEPS_COMPILE_PARTITION_COUNT MIX_TARGET) ++
+    ~w(XDG_DATA_HOME XDG_CONFIG_HOME),
+  &System.delete_env/1
+)
 
 defmodule MixTest.Case do
   use ExUnit.CaseTemplate