Skip to content

Commit c953d08

Browse files
author
bryanhuntesl
committed
make tests pass under erlang 20
1 parent 78ffede commit c953d08

File tree

4 files changed

+23
-13
lines changed

4 files changed

+23
-13
lines changed

test/riakc_pb_socket_tests.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
-module(riakc_pb_socket_tests).
2525

26-
-compile(export_all).
26+
-export([ integration_tests/0 ]).
2727

2828
-include("riakc.hrl").
2929

test/riakc_test_utils.erl

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,28 @@
2323

2424
-module(riakc_test_utils).
2525

26-
-compile(export_all).
26+
-export([test_riak_node/0,
27+
test_eunit_node/0,
28+
test_cookie/0,
29+
test_ip/0,
30+
test_port/0,
31+
start_link/0,
32+
start_link/1,
33+
riak_version/0,
34+
compare_versions/2,
35+
wait_until/1,
36+
wait_until/3,
37+
reset_riak/0,
38+
reset_solr/1,
39+
reset_riak_12/0,
40+
set_test_backend/0,
41+
reset_riak_legacy/0,
42+
reset_ring/0,
43+
riak_pb_listener_pid/0,
44+
pause_riak_pb_listener/0,
45+
resume_riak_pb_listener/0,
46+
kill_riak_pb_sockets/0,
47+
maybe_start_network/0]).
2748

2849
-include_lib("eunit/include/eunit.hrl").
2950

test/riakc_ts_tests.erl

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,8 @@
1919
%% under the License.
2020
%%
2121
%% -------------------------------------------------------------------
22-
-ifdef(TEST).
23-
2422
-module(riakc_ts_tests).
2523

26-
-compile(export_all).
27-
2824
-include("riakc.hrl").
2925

3026
-include_lib("eunit/include/eunit.hrl").
@@ -106,4 +102,3 @@ integration_test_() ->
106102
end
107103
end,
108104
{setup, SetupFun, CleanupFun, {generator, GenFun}}.
109-
-endif.

test/riakc_utils_tests.erl

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,10 @@
1919
%% under the License.
2020
%%
2121
%% -------------------------------------------------------------------
22-
-ifdef(TEST).
23-
2422
-module(riakc_utils_tests).
2523

26-
-compile(export_all).
27-
2824
-include_lib("eunit/include/eunit.hrl").
2925

3026
bad_unicode_binary_test() ->
3127
S = <<"\xa0\xa1">>,
3228
?assertThrow({unicode_error, _Msg}, riakc_utils:characters_to_unicode_binary(S)).
33-
34-
-endif.

0 commit comments

Comments
 (0)