From 529025b6fdee96e0d9f487ebc20ce03e387910ca Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Sun, 17 May 2015 19:51:58 -0500
Subject: purge loaded code when it conflicts with project apps in tests

---
 src/rebar_prv_common_test.erl |  4 ++--
 src/rebar_prv_eunit.erl       |  5 +++--
 src/rebar_utils.erl           | 18 ++++++++++++++++++
 3 files changed, 23 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/rebar_prv_common_test.erl b/src/rebar_prv_common_test.erl
index eb51d8d..b119100 100644
--- a/src/rebar_prv_common_test.erl
+++ b/src/rebar_prv_common_test.erl
@@ -38,7 +38,7 @@ init(State) ->
 -spec do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}.
 do(State) ->
     ?INFO("Running Common Test suites...", []),
-    code:add_pathsa(rebar_state:code_paths(State, all_deps)),
+    rebar_utils:update_code(rebar_state:code_paths(State, all_deps)),
 
     %% Run ct provider prehooks
     Providers = rebar_state:providers(State),
@@ -49,7 +49,7 @@ do(State) ->
         {ok, State1} = Result ->
             %% Run ct provider posthooks
             rebar_hooks:run_all_hooks(Cwd, post, ?PROVIDER, Providers, State1),
-            rebar_utils:cleanup_code_path(rebar_state:code_paths(State1, default)),
+            rebar_utils:cleanup_code_path(rebar_state:code_paths(State, default)),
             Result;
         ?PRV_ERROR(_) = Error ->
             rebar_utils:cleanup_code_path(rebar_state:code_paths(State, default)),
diff --git a/src/rebar_prv_eunit.erl b/src/rebar_prv_eunit.erl
index 8eaa926..f04a150 100644
--- a/src/rebar_prv_eunit.erl
+++ b/src/rebar_prv_eunit.erl
@@ -37,7 +37,8 @@ init(State) ->
 -spec do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}.
 do(State) ->
     ?INFO("Performing EUnit tests...", []),
-    code:add_pathsa(rebar_state:code_paths(State, all_deps)),
+    rebar_utils:update_code(rebar_state:code_paths(State, all_deps)),
+
     %% Run eunit provider prehooks
     Providers = rebar_state:providers(State),
     Cwd = rebar_dir:get_cwd(),
@@ -49,7 +50,7 @@ do(State) ->
                 {ok, State1} ->
                     %% Run eunit provider posthooks
                     rebar_hooks:run_all_hooks(Cwd, post, ?PROVIDER, Providers, State1),
-                    rebar_utils:cleanup_code_path(rebar_state:code_paths(State1, default)),
+                    rebar_utils:cleanup_code_path(rebar_state:code_paths(State, default)),
                     {ok, State1};
                 Error ->
                     rebar_utils:cleanup_code_path(rebar_state:code_paths(State, default)),
diff --git a/src/rebar_utils.erl b/src/rebar_utils.erl
index 160d547..ffa29e6 100644
--- a/src/rebar_utils.erl
+++ b/src/rebar_utils.erl
@@ -47,6 +47,7 @@
          deprecated/4,
          erl_opts/1,
          indent/1,
+         update_code/1,
          cleanup_code_path/1,
          args_to_tasks/1,
          expand_env_variable/3,
@@ -563,6 +564,23 @@ filter_defines([Opt | Rest], Acc) ->
 indent(Amount) when erlang:is_integer(Amount) ->
     [?ONE_LEVEL_INDENT || _ <- lists:seq(1, Amount)].
 
+%% Replace code paths with new paths for existing apps and
+%% purge code of the old modules from those apps.
+update_code(Paths) ->
+    lists:foreach(fun(Path) ->
+                          Name = filename:basename(Path, "/ebin"),
+                          App = list_to_atom(Name),
+                          application:load(App),
+                          case application:get_key(App, modules) of
+                              undefined ->
+                                  code:add_patha(Path),
+                                  ok;
+                              {ok, Modules} ->
+                                  code:replace_path(Name, Path),
+                                  [begin code:purge(M), code:delete(M) end || M <- Modules]
+                          end
+                  end, Paths).
+
 cleanup_code_path(OrigPath) ->
     CurrentPath = code:get_path(),
     AddedPaths = CurrentPath -- OrigPath,
-- 
cgit v1.1