Skip to content

tests: add more logging to expect test #5078

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
algorandskiy merged 1 commit into from
Jan 30, 2023
Merged

tests: add more logging to expect test #5078

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions netdeploy/networkTemplate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,14 +133,17 @@ func (t NetworkTemplate) createNodeDirectories(targetFolder string, binDir strin
if importKeys && hasWallet {
var client libgoal.Client
client, err = libgoal.MakeClientWithBinDir(binDir, nodeDir, "", libgoal.KmdClient)
if err != nil {
return
}
_, err = client.CreateWallet(libgoal.UnencryptedWalletName, nil, crypto.MasterDerivationKey{})
if err != nil {
return
}

_, _, err = util.ExecAndCaptureOutput(importKeysCmd, "account", "importrootkey", "-w", string(libgoal.UnencryptedWalletName), "-d", nodeDir)
stdout, stderr, err := util.ExecAndCaptureOutput(importKeysCmd, "account", "importrootkey", "-w", string(libgoal.UnencryptedWalletName), "-d", nodeDir)
if err != nil {
return
return nil, nil, fmt.Errorf("goal account importrootkey failed: %w\nstdout: %s\nstderr: %s", err, stdout, stderr)
}
}

Expand Down
21 changes: 21 additions & 0 deletions test/e2e-go/cli/goal/expect/goalExpectCommon.exp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,13 @@ proc ::AlgorandGoal::Abort { ERROR } {
set nodeLog [exec -- tail -n 50 $NODE_DATA_DIR/node.log]
puts "\n$NODE_DATA_DIR/node.log:\r\n$nodeLog"
set LOGS_COLLECTED 1

set outLog [exec cat $NODE_DATA_DIR/kmd-v0.5/kmd-out.log]
puts "\n$NODE_DATA_DIR/kmd-v0.5/kmd-out.log:\r\n$outLog"
set errLog [exec cat $NODE_DATA_DIR/kmd-v0.5/kmd-err.log]
puts "\n$NODE_DATA_DIR/kmd-v0.5/kmd-err.log:\r\n$errLog"
set kmdLog [exec -- tail -n 50 $NODE_DATA_DIR/kmd-v0.5/kmd.log]
puts "\n$NODE_DATA_DIR/kmd-v0.5/kmd.log:\r\n$kmdLog"
}
set NODE_DATA_DIR $::GLOBAL_TEST_ROOT_DIR/Node
puts "Node path $NODE_DATA_DIR"
Expand All @@ -75,6 +82,13 @@ proc ::AlgorandGoal::Abort { ERROR } {
set nodeLog [exec -- tail -n 50 $NODE_DATA_DIR/node.log]
puts "\n$NODE_DATA_DIR/node.log:\r\n$nodeLog"
set LOGS_COLLECTED 1

set outLog [exec cat $NODE_DATA_DIR/kmd-v0.5/kmd-out.log]
puts "\n$NODE_DATA_DIR/kmd-v0.5/kmd-out.log:\r\n$outLog"
set errLog [exec cat $NODE_DATA_DIR/kmd-v0.5/kmd-err.log]
puts "\n$NODE_DATA_DIR/kmd-v0.5/kmd-err.log:\r\n$errLog"
set kmdLog [exec -- tail -n 50 $NODE_DATA_DIR/kmd-v0.5/kmd.log]
puts "\n$NODE_DATA_DIR/kmd-v0.5/kmd.log:\r\n$kmdLog"
}
}

Expand All @@ -91,6 +105,13 @@ proc ::AlgorandGoal::Abort { ERROR } {
puts "\n$::GLOBAL_TEST_ALGO_DIR/algod-err.log:\r\n$errLog"
set nodeLog [exec -- tail -n 50 $::GLOBAL_TEST_ALGO_DIR/node.log]
puts "\n$::GLOBAL_TEST_ALGO_DIR/node.log:\r\n$nodeLog"

set outLog [exec cat $GLOBAL_TEST_ALGO_DIR/kmd-v0.5/kmd-out.log]
puts "\n$GLOBAL_TEST_ALGO_DIR/kmd-v0.5/kmd-out.log:\r\n$outLog"
set errLog [exec cat $GLOBAL_TEST_ALGO_DIR/kmd-v0.5/kmd-err.log]
puts "\n$GLOBAL_TEST_ALGO_DIR/kmd-v0.5/kmd-err.log:\r\n$errLog"
set kmdLog [exec -- tail -n 50 $GLOBAL_TEST_ALGO_DIR/kmd-v0.5/kmd.log]
puts "\n$GLOBAL_TEST_ALGO_DIR/kmd-v0.5/kmd.log:\r\n$kmdLog"
}
}

Expand Down