summaryrefslogtreecommitdiff
path: root/test/e2e-go/cli/goal/expect/catchpointCatchupTest.exp
diff options
context:
space:
mode:
Diffstat (limited to 'test/e2e-go/cli/goal/expect/catchpointCatchupTest.exp')
-rw-r--r--test/e2e-go/cli/goal/expect/catchpointCatchupTest.exp15
1 files changed, 14 insertions, 1 deletions
diff --git a/test/e2e-go/cli/goal/expect/catchpointCatchupTest.exp b/test/e2e-go/cli/goal/expect/catchpointCatchupTest.exp
index 39f47e12c..f52e57a21 100644
--- a/test/e2e-go/cli/goal/expect/catchpointCatchupTest.exp
+++ b/test/e2e-go/cli/goal/expect/catchpointCatchupTest.exp
@@ -108,15 +108,25 @@ if { [catch {
::AlgorandGoal::StartNode $TEST_ROOT_DIR/Node False $WEBPROXY_LISTEN_ADDRESS
+ # once the node is started we can clear the ::GLOBAL_TEST_ALGO_DIR, so that shutdown would be done as a network.
+ unset ::GLOBAL_TEST_ALGO_DIR
+
::AlgorandGoal::WaitForRound 1 $TEST_ROOT_DIR/Node
set CATCHPOINT [::AlgorandGoal::GetNodeLastCatchpoint $TEST_ROOT_DIR/Primary]
puts "Catchpoint is $CATCHPOINT"
+ regexp -nocase {([0-9]*)#[A-Z2-7]*} $CATCHPOINT CATCHPOINT_ROUND CATCHPOINT_ROUND
+
+ puts "Catchpoint round is $CATCHPOINT_ROUND"
+
+ # wait for the primary to reach $CATCHPOINT_ROUND + 5, so that the catchpoint file would be saved
+ ::AlgorandGoal::WaitForRound [expr {int($CATCHPOINT_ROUND + 5)}] $TEST_ROOT_DIR/Primary
+
::AlgorandGoal::StartCatchup $TEST_ROOT_DIR/Node $CATCHPOINT
- ::AlgorandGoal::WaitForRound 37 $TEST_ROOT_DIR/Node
+ ::AlgorandGoal::WaitForRound $CATCHPOINT_ROUND $TEST_ROOT_DIR/Node
::AlgorandGoal::StopNode $TEST_ROOT_DIR/Node
@@ -164,6 +174,9 @@ if { [catch {
::AlgorandGoal::StartNode $TEST_ROOT_DIR/Node False $WEBPROXY_LISTEN_ADDRESS
+ # once the node is started we can clear the ::GLOBAL_TEST_ALGO_DIR, so that shutdown would be done as a network.
+ set ::GLOBAL_TEST_ALGO_DIR ""
+
::AlgorandGoal::WaitForRound 38 $TEST_ROOT_DIR/Node
::AlgorandGoal::StopNode $TEST_ROOT_DIR/Node