Permalink
Browse files

Minor cleanup.

  • Loading branch information...
1 parent 72ad8aa commit 22cd1206588a46d4ec3a4efcaead1ae0ec469cb0 @neilconway neilconway committed Jan 30, 2012
Showing with 7 additions and 8 deletions.
  1. +0 −1 kvs/kvs.rb
  2. +6 −6 test/tc_heartbeat.rb
  3. +1 −1 test/tc_kvs.rb
View
@@ -70,7 +70,6 @@ module ReplicatedKVS
include KVSProtocol
include MulticastProtocol
import BasicKVS => :kvs
- #import LSKVS => :kvs
bloom :local_indir do
kvget_response <= kvs.kvget_response
View
@@ -10,11 +10,6 @@ class HB
bootstrap do
payload <= [['foo']]
- payload <= [['foo']]
- payload <= [['foo']]
- add_member <= [[ 1, "localhost:46362" ]]
- add_member <= [[ 2, "localhost:46363" ]]
- add_member <= [[ 3, "localhost:46364" ]]
end
end
@@ -23,7 +18,12 @@ class TestHB < Test::Unit::TestCase
def test_heartbeat_group
port_list = [46362, 46363, 46364]
hb_list = port_list.map {|p| HB.new(:port => p)}
- hb_list.each {|h| h.run_bg}
+ hb_list.each do |h,i|
+ port_list.each_with_index do |p, i|
+ h.add_member <+ [[i, "localhost:#{p}"]]
+ end
+ h.run_bg
+ end
# wait for the heartbeats to start appearing
hb_list.first.delta(:last_heartbeat)
View
@@ -39,7 +39,7 @@ def ntest_wl5
def test_wl1
trc = false
# in a distributed, ordered workload, the right thing happens
- v = BestEffortReplicatedKVS.new(@opts.merge(:tag => 'dist_primary', :port => 12345, :dump_rewrite => true, :trace => trc))
+ v = BestEffortReplicatedKVS.new(@opts.merge(:tag => 'dist_primary', :port => 12345, :trace => trc))
v2 = BestEffortReplicatedKVS.new(@opts.merge(:tag => 'dist_backup', :port => 12346, :trace => trc))
add_members(v, v.ip_port, v2.ip_port)
add_members(v2, v.ip_port, v2.ip_port)

0 comments on commit 22cd120

Please sign in to comment.