diff --git a/unit-tests/060_catchup_same_owner.txt b/unit-tests/060_catchup_same_owner.txt index 56fce2e..73899cd 100644 --- a/unit-tests/060_catchup_same_owner.txt +++ b/unit-tests/060_catchup_same_owner.txt @@ -1,37 +1,38 @@ # vim: ft=sh et : -# We've got the ticket; on catchup, peer agrees with us re. owner, but has a -# higher ballot number. +# We've got the ticket; a peer agrees with us re. owner, but has a +# higher term number. # We must not lose the ticket. ticket: - state ST_INIT - last_ack_ballot 100 - new_ballot 100 - owner local - expires time(0) + 35 + state ST_LEADER + current_term 100 + leader local + term_expires time(0) + 35 + term_duration 3000 + retries 6 + timeout 1 + hb_sent_at time(0) - 2000 + gdb0: - watch booth_conf->ticket[0].owner § commands § bt § c § end + watch booth_conf->ticket[0].leader § commands § bt § c § end # No message0 outgoing0: - header.cmd CMD_CATCHUP + header.cmd OP_HEARTBEAT header.result RLT_SUCCESS - ticket.ballot 100 - ticket.prev_ballot 100 - ticket.owner local->site_id + ticket.term 100 + ticket.leader local->site_id -message1: # catchup, same owner - header.cmd CMR_CATCHUP +message1: # same owner + header.cmd OP_HEARTBEAT header.result RLT_SUCCESS header.from booth_conf->site[2].site_id - ticket.expiry 5 - ticket.ballot 120 - ticket.prev_ballot 120 - ticket.owner local->site_id + ticket.term 110 + ticket.leader local->site_id finally: - owner local + leader local