← Back to branch summary

~brightbox/riak/master

« back to all changes in this revision

Viewing changes to src/riak_core_ring_manager.erl

  • Committer: GitHub
  • Author(s): Martin Sumner
  • Date: 2019-11-18 12:38:42 UTC
  • mfrom: (559.2.1)
  • Revision ID: git-v1:a01d63a735a0fd39911da4d9c974ac512b25069c
Merge pull request #948 from basho/develop-3.0-testfix

Fix broken test

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/riak_core_ring_manager.erl
710
710
     end || {AppKey, Val} <- Core_Settings],
711
711
    riak_core_ring_events:start_link(),
712
712
    riak_core_ring_manager:start_link(test),
 
713
    riak_core_claimant:start_link(),
713
714
    riak_core_vnode_sup:start_link(),
714
715
    riak_core_vnode_master:start_link(riak_core_vnode),
715
716
    riak_core_test_util:setup_mockring1(),
716
717
    ?assertEqual(ok, riak_core_ring_manager:refresh_my_ring()),
717
718
    riak_core_ring_manager:stop(),
 
719
    riak_core_claimant:stop(),
718
720
    %% Cleanup the ring file created for this test
719
721
    {ok, RingFile} = find_latest_ringfile(),
720
722
    file:delete(RingFile),