Skip to content

Commit d79be99

Browse files
author
Brian Sparrow
committed
Remove unneeded code from riaknostic test
1 parent 520676a commit d79be99

File tree

1 file changed

+0
-28
lines changed

1 file changed

+0
-28
lines changed

tests/riaknostic_rt.erl

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,11 @@
2222
-export([confirm/0]).
2323
-include_lib("eunit/include/eunit.hrl").
2424

25-
%% Change when a new release comes out.
26-
-define(RIAKNOSTIC_URL, "https://github.com/basho/riaknostic/downloads/riaknostic-1.0.2.tar.gz").
27-
28-
%% REQUIRES (sh, curl, tar)
29-
3025
confirm() ->
3126
%% Build a small cluster
3227
[Node1, _Node2] = rt:build_cluster(2, []),
3328
?assertEqual(ok, rt:wait_until_nodes_ready([Node1])),
3429

35-
%% Install riaknostic for Riak versions below 1.3.0
36-
riaknostic_bootstrap(Node1),
37-
3830
%% Run through all tests on Node1
3931
check_riaknostic_execute(Node1),
4032
check_riaknostic_usage(Node1),
@@ -45,26 +37,6 @@ confirm() ->
4537
lager:info("Test riaknostic: PASS"),
4638
pass.
4739

48-
riaknostic_bootstrap(Node) ->
49-
lager:info("Check if riaknostic is installed"),
50-
{ok, RiaknosticOut1} = rt:admin(Node, ["diag"]),
51-
riaknostic_install((rt:str(RiaknosticOut1, "is not present!")), Node).
52-
53-
%% riaknostic is already installed, move along
54-
riaknostic_install(false, _Node) ->
55-
ok;
56-
57-
%% install riaknostic
58-
riaknostic_install(true, Node) ->
59-
%% Install
60-
lager:info("Installing Riaknostic"),
61-
{ok, LibDir} = rpc:call(Node, application, get_env, [riak_core, platform_lib_dir]),
62-
Cmd = io_lib:format("sh -c \"cd ~s && curl -O -L ~s && tar xzf ~s\"",
63-
[LibDir, ?RIAKNOSTIC_URL, filename:basename(?RIAKNOSTIC_URL)]),
64-
lager:info("Running command: ~s", [Cmd]),
65-
lager:debug("~p~n", [rpc:call(Node, os, cmd, [Cmd])]),
66-
ok.
67-
6840
%% Check that riaknostic executes
6941
check_riaknostic_execute(Node) ->
7042
%% Execute

0 commit comments

Comments
 (0)