summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDave Smith <dizzyd@dizzyd.com>2013-09-20 13:05:11 -0700
committerDave Smith <dizzyd@dizzyd.com>2013-09-20 13:05:11 -0700
commitadad711d51552c6ca56c4114b70f7273f10ac09a (patch)
treedafd60be0d2fd883a1b13f8e23028bb0da3d376b /src
parent047f1b7e96b5e57890e6e3f7d0b04c92f3a3541e (diff)
parent0550560221fde6d5c19bec472e395fb20d720252 (diff)
Merge pull request #122 from tuncer/net_kernel
Fix eunit regression introduced in 2716d83a18
Diffstat (limited to 'src')
-rw-r--r--src/rebar_eunit.erl12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/rebar_eunit.erl b/src/rebar_eunit.erl
index 95ba3e8..d39b1a2 100644
--- a/src/rebar_eunit.erl
+++ b/src/rebar_eunit.erl
@@ -802,11 +802,11 @@ pause_until_net_kernel_stopped() ->
pause_until_net_kernel_stopped(0) ->
exit(net_kernel_stop_failed);
pause_until_net_kernel_stopped(N) ->
- try
- timer:sleep(100),
- pause_until_net_kernel_stopped(N - 1)
- catch
- error:badarg ->
+ case node() of
+ 'nonode@nohost' ->
?DEBUG("Stopped net kernel.\n", []),
- ok
+ ok;
+ _ ->
+ timer:sleep(100),
+ pause_until_net_kernel_stopped(N - 1)
end.