From 71498786e790b217c352ce03cbf531be72420f75 Mon Sep 17 00:00:00 2001
From: Jon Anderson <janderson@basho.com>
Date: Tue, 5 Nov 2013 14:40:46 -0500
Subject: [PATCH 1/5] initial checkin

fixed type and case statement ordering

removed unecessary ?DEBUG statement
---
 src/rebar_eunit.erl | 44 +++++++++++++++++++++++++++++++++-----------
 1 file changed, 33 insertions(+), 11 deletions(-)

diff --git a/src/rebar_eunit.erl b/src/rebar_eunit.erl
index d39b1a21..da83cef0 100644
--- a/src/rebar_eunit.erl
+++ b/src/rebar_eunit.erl
@@ -39,6 +39,16 @@
 %%        <li>Reset OTP application environment variables</li>
 %%       </ul>
 %%   </li>
+%%   <li>reset_after_each_eunit::boolean() - default = false.
+%%       If true, try to "reset" VM state to approximate state prior to
+%%       running each EUnit test in the contstructed list of tests:
+%%       <ul>
+%%        <li>Stop net_kernel if it was started</li>
+%%        <li>Stop OTP applications not running before EUnit tests were run</li>
+%%        <li>Kill processes not running before EUnit tests were run</li>
+%%        <li>Reset OTP application environment variables</li>
+%%       </ul>
+%%   </li>
 %% </ul>
 %% The following Global options are supported:
 %% <ul>
@@ -164,19 +174,20 @@ run_eunit(Config, CodePath, SrcErls) ->
     {ok, CoverLog} = cover_init(Config, ModuleBeamFiles),
 
     StatusBefore = status_before_eunit(),
-    EunitResult = perform_eunit(Config, Tests),
-
-    perform_cover(Config, FilteredModules, SrcModules),
-    cover_close(CoverLog),
 
-    case proplists:get_value(reset_after_eunit, get_eunit_opts(Config),
-                             true) of
-        true ->
-            reset_after_eunit(StatusBefore);
+    DoClean = rebar_config:get_global(Config, reset_after_eunit, true),
+    EunitResult = case rebar_config:get_global(Config, reset_after_each_eunit, false) of
         false ->
-            ok
+            ?DEBUG("running all tests", []),
+            perform_eunit(Config, Tests, StatusBefore, DoClean);
+        _IsTrue ->
+            ?DEBUG("running cleanup after each test", []),
+            [perform_eunit(Config, T, StatusBefore, true) || T <- Tests]
     end,
 
+    perform_cover(Config, FilteredModules, SrcModules),
+    cover_close(CoverLog),
+
     %% Stop cover to clean the cover_server state. This is important if we want
     %% eunit+cover to not slow down when analyzing many Erlang modules.
     ok = cover:stop(),
@@ -192,6 +203,14 @@ run_eunit(Config, CodePath, SrcErls) ->
     true = code:set_path(CodePath),
     ok.
 
+maybe_cleanup(StatusBefore, DoClean) ->
+    case DoClean of
+        true ->
+            reset_after_eunit(StatusBefore);
+        false ->
+            ok
+    end.
+
 ensure_dirs() ->
     %% Make sure ?EUNIT_DIR/ and ebin/ directory exists (append dummy module)
     ok = filelib:ensure_dir(filename:join(eunit_dir(), "dummy")),
@@ -391,18 +410,20 @@ pre15b02_eunit_primitive(generator, M, F) ->
 %% == run tests ==
 %%
 
-perform_eunit(Config, Tests) ->
+perform_eunit(Config, Tests, StatusBeforeEunit, DoClean) ->
     EunitOpts = get_eunit_opts(Config),
 
     %% Move down into ?EUNIT_DIR while we run tests so any generated files
     %% are created there (versus in the source dir)
     Cwd = rebar_utils:get_cwd(),
     ok = file:set_cwd(?EUNIT_DIR),
-
+    
+    ?DEBUG("running tests:~w with options:~w~n", [Tests, EunitOpts]),
     EunitResult = (catch eunit:test(Tests, EunitOpts)),
 
     %% Return to original working dir
     ok = file:set_cwd(Cwd),
+    maybe_cleanup(StatusBeforeEunit, DoClean),
 
     EunitResult.
 
@@ -417,6 +438,7 @@ get_eunit_opts(Config) ->
 
     BaseOpts ++ rebar_config:get_list(Config, eunit_opts, []).
 
+
 %%
 %% == code coverage ==
 %%

From 4a46214840494fe4cfe469ddd7e54622f603d11e Mon Sep 17 00:00:00 2001
From: Jon Anderson <janderson@basho.com>
Date: Wed, 6 Nov 2013 14:02:06 -0500
Subject: [PATCH 2/5] refactored maybe_cleanup per @lordnull

---
 src/rebar_eunit.erl | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/rebar_eunit.erl b/src/rebar_eunit.erl
index da83cef0..b0a2db9f 100644
--- a/src/rebar_eunit.erl
+++ b/src/rebar_eunit.erl
@@ -203,13 +203,10 @@ run_eunit(Config, CodePath, SrcErls) ->
     true = code:set_path(CodePath),
     ok.
 
-maybe_cleanup(StatusBefore, DoClean) ->
-    case DoClean of
-        true ->
-            reset_after_eunit(StatusBefore);
-        false ->
-            ok
-    end.
+maybe_cleanup(StatusBefore, true) ->
+    reset_after_eunit(StatusBefore);
+maybe_cleanup(_StatusBefore, false) ->
+    ok.
 
 ensure_dirs() ->
     %% Make sure ?EUNIT_DIR/ and ebin/ directory exists (append dummy module)

From c31ddb4f3f20299dfbb45dc5678ac2291291c398 Mon Sep 17 00:00:00 2001
From: Jon Anderson <janderson@basho.com>
Date: Wed, 6 Nov 2013 17:18:34 -0500
Subject: [PATCH 3/5] fixed rebar_config:get_global boolean handling; it had
 been treating booleans as strings; changed it to convert

---
 src/rebar_config.erl | 9 ++++++++-
 src/rebar_deps.erl   | 4 ++--
 src/rebar_eunit.erl  | 8 +++++---
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/rebar_config.erl b/src/rebar_config.erl
index 461de5de..f2b80924 100644
--- a/src/rebar_config.erl
+++ b/src/rebar_config.erl
@@ -107,7 +107,14 @@ get_global(Config, Key, Default) ->
         error ->
             Default;
         {ok, Value} ->
-            Value
+            case string:to_lower(Value) of
+                "true" ->
+                    true;
+                "false" ->
+                    false;
+                _ ->
+                    Value
+                end
     end.
 
 is_verbose(Config) ->
diff --git a/src/rebar_deps.erl b/src/rebar_deps.erl
index 5e4f482b..ae57420e 100644
--- a/src/rebar_deps.erl
+++ b/src/rebar_deps.erl
@@ -92,7 +92,7 @@ preprocess(Config, _) ->
             %% Also, if skip_deps=comma,separated,app,list, then only the given
             %% dependencies are skipped.
             NewConfig = case rebar_config:get_global(Config3, skip_deps, false) of
-                "true" ->
+                true ->
                     lists:foldl(
                         fun(#dep{dir = Dir}, C) ->
                                 rebar_config:set_skip_dir(C, Dir)
@@ -106,7 +106,7 @@ preprocess(Config, _) ->
                                     false -> C
                                 end
                         end, Config3, AvailableDeps);
-                _ ->
+                false ->
                     Config3
             end,
 
diff --git a/src/rebar_eunit.erl b/src/rebar_eunit.erl
index b0a2db9f..dc2cd2a2 100644
--- a/src/rebar_eunit.erl
+++ b/src/rebar_eunit.erl
@@ -176,6 +176,8 @@ run_eunit(Config, CodePath, SrcErls) ->
     StatusBefore = status_before_eunit(),
 
     DoClean = rebar_config:get_global(Config, reset_after_eunit, true),
+    io:format("RESET_AFTER_EUNIT: ~p~n", [DoClean]),
+    io:format("RESET_AFTER_EACH_EUNIT: ~p~n", [rebar_config:get_global(Config, reset_after_each_eunit, false)]),
     EunitResult = case rebar_config:get_global(Config, reset_after_each_eunit, false) of
         false ->
             ?DEBUG("running all tests", []),
@@ -203,10 +205,10 @@ run_eunit(Config, CodePath, SrcErls) ->
     true = code:set_path(CodePath),
     ok.
 
-maybe_cleanup(StatusBefore, true) ->
-    reset_after_eunit(StatusBefore);
 maybe_cleanup(_StatusBefore, false) ->
-    ok.
+    ok;
+maybe_cleanup(StatusBefore, true) ->
+    reset_after_eunit(StatusBefore).
 
 ensure_dirs() ->
     %% Make sure ?EUNIT_DIR/ and ebin/ directory exists (append dummy module)

From 2b682d3240f8658f7e0f4989054db783f5f42dfa Mon Sep 17 00:00:00 2001
From: Jon Anderson <janderson@basho.com>
Date: Wed, 6 Nov 2013 17:19:44 -0500
Subject: [PATCH 4/5] took out debug io:format statements

---
 src/rebar_eunit.erl | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/rebar_eunit.erl b/src/rebar_eunit.erl
index dc2cd2a2..e7d62a49 100644
--- a/src/rebar_eunit.erl
+++ b/src/rebar_eunit.erl
@@ -176,8 +176,7 @@ run_eunit(Config, CodePath, SrcErls) ->
     StatusBefore = status_before_eunit(),
 
     DoClean = rebar_config:get_global(Config, reset_after_eunit, true),
-    io:format("RESET_AFTER_EUNIT: ~p~n", [DoClean]),
-    io:format("RESET_AFTER_EACH_EUNIT: ~p~n", [rebar_config:get_global(Config, reset_after_each_eunit, false)]),
+
     EunitResult = case rebar_config:get_global(Config, reset_after_each_eunit, false) of
         false ->
             ?DEBUG("running all tests", []),

From 31a420aba5e3cccf1304e8483ddc24c460e0d236 Mon Sep 17 00:00:00 2001
From: Jon Anderson <janderson@basho.com>
Date: Wed, 6 Nov 2013 17:41:06 -0500
Subject: [PATCH 5/5] added newlines to debug output statements

---
 src/rebar_eunit.erl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/rebar_eunit.erl b/src/rebar_eunit.erl
index e7d62a49..bb00e335 100644
--- a/src/rebar_eunit.erl
+++ b/src/rebar_eunit.erl
@@ -179,10 +179,10 @@ run_eunit(Config, CodePath, SrcErls) ->
 
     EunitResult = case rebar_config:get_global(Config, reset_after_each_eunit, false) of
         false ->
-            ?DEBUG("running all tests", []),
+            ?DEBUG("running all tests~n", []),
             perform_eunit(Config, Tests, StatusBefore, DoClean);
-        _IsTrue ->
-            ?DEBUG("running cleanup after each test", []),
+        true ->
+            ?DEBUG("running cleanup after each test~n", []),
             [perform_eunit(Config, T, StatusBefore, true) || T <- Tests]
     end,