less output from eunit tests, added NODEBUG

bet365 · Jan 8, 2014 · d5162e3 · d5162e3
1 parent 03d6508
commit d5162e3
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 1 deletion.
diff --git a/test/repl_leader_eqc.erl → attic/repl_leader_eqc.erl b/test/repl_leader_eqc.erl → attic/repl_leader_eqc.erl
diff --git a/src/riak_core_cluster_conn.erl b/src/riak_core_cluster_conn.erl
@@ -11,6 +11,7 @@
 -include("riak_core_connection.hrl").
 
 -ifdef(TEST).
+-define(NODEBUG, true).
 -include_lib("eunit/include/eunit.hrl").
 %% For testing, we need to have two different cluster manager services running
 %% on the same node, which is normally not done. The remote cluster service is

diff --git a/src/riak_repl2_ip.erl b/src/riak_repl2_ip.erl
@@ -5,6 +5,7 @@
         maybe_apply_nat_map/3, apply_reverse_nat_map/3]).
 
 -ifdef(TEST).
+-define(NODEBUG, true).
 -include_lib("eunit/include/eunit.hrl").
 -endif.
 
@@ -318,7 +319,8 @@ make_ifaddrs(Interfaces) ->
 
 
 get_matching_address_test_() ->
-    {setup, fun() ->
+        error_logger:tty(false),
+        {setup, fun() ->
                 application:set_env(riak_core, cluster_mgr, {{0, 0, 0, 0},
                         9090}),
                 lager:start(),
@@ -499,6 +501,7 @@ get_matching_address_test_() ->
         ]}.
 
 determine_netmask_test_() ->
+    error_logger:tty(false),
     [
         {"simple case",
             fun() ->
@@ -524,6 +527,7 @@ determine_netmask_test_() ->
     ].
 
 natmap_test_() ->
+    error_logger:tty(false),
     [
         {"forward lookups work",
             fun() ->

diff --git a/src/riak_repl_stats.erl b/src/riak_repl_stats.erl
@@ -343,6 +343,7 @@ is_rt_dirty() ->
 -ifdef(TEST).
 
 repl_stats_test_() ->
+    error_logger:tty(false),
     {"stats test", setup, fun() ->
                     folsom:start(),
                     meck:new(folsom_utils, [passthrough]),
@@ -372,13 +373,15 @@ repl_stats_test_() ->
     }.
 
 test_register_stats() ->
+   error_logger:tty(false),
     register_stats(),
     RegisteredReplStats = [Stat || {App, Stat} <- folsom_metrics:get_metrics(),
                                    App == riak_repl],
     {Stats, _Types} = lists:unzip(stats()),
     ?assertEqual(lists:sort(Stats), lists:sort(RegisteredReplStats)).
 
 test_populate_stats() ->
+    error_logger:tty(false),
     Bytes = 1000,
     ok = client_bytes_sent(Bytes),
     ok = client_bytes_recv(Bytes),
@@ -400,6 +403,7 @@ test_populate_stats() ->
     ok = rt_sink_errors().
 
 test_check_stats() ->
+   error_logger:tty(false),
     Expected = [
         {server_bytes_sent,1000},
         {server_bytes_recv,1000},

diff --git a/test/riak_core_cluster_mgr_sup_tests.erl b/test/riak_core_cluster_mgr_sup_tests.erl
@@ -5,6 +5,7 @@
 -include_lib("eunit/include/eunit.hrl").
 
 murdering_test_() ->
+     error_logger:tty(false),
     {setup, fun() ->
     % if the cluster_mgr is restarted after the leader process is running,
     % it should ask about who the current leader is.

diff --git a/test/riak_core_cluster_mgr_tests.erl b/test/riak_core_cluster_mgr_tests.erl
@@ -6,6 +6,7 @@
 
 -include("riak_core_cluster.hrl").
 -include("riak_core_connection.hrl").
+-define(NODEBUG, true).
 -include_lib("eunit/include/eunit.hrl").
 
 -define(TRACE(Stmt),Stmt).
@@ -31,6 +32,7 @@
 -define(MULTINODE_REMOTE_ADDR, {"127.0.0.1", 6097}).
 
 single_node_test_() ->
+    error_logger:tty(false),
     {setup,
     fun start_link_setup/0,
     fun(Pids) ->

diff --git a/test/riak_repl2_rt_source_sink_tests.erl b/test/riak_repl2_rt_source_sink_tests.erl
@@ -21,6 +21,7 @@
 }).
 
 connection_test_() ->
+    error_logger:tty(false),
     {foreach, fun() ->
         riak_repl_test_util:start_test_ring(),
         riak_repl_test_util:abstract_gen_tcp(),

diff --git a/test/riak_repl_sup_tests.erl b/test/riak_repl_sup_tests.erl
@@ -5,6 +5,7 @@
 % Why? Because it's nice to know that system can start.
 
 can_start_test() ->
+     error_logger:tty(false),
     {timeout, 60000, {setup, fun() ->
         % core features that are needed
         {ok, _Eventer} = riak_core_ring_events:start_link(),