Skip to content

Commit

Permalink
Fix compose and e2e tests
Browse files Browse the repository at this point in the history
  • Loading branch information
maru-ava committed Dec 23, 2024
1 parent 58c1635 commit 8af3cb9
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 0 deletions.
4 changes: 4 additions & 0 deletions tests/antithesis/compose.go
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,10 @@ func GenerateComposeConfig(network *tmpnet.Network, baseImageName string, runtim
network.DefaultRuntimeConfig = tmpnet.NodeRuntimeConfig{
AvalancheGoPath: avalancheGoPath,
}
// TODO(marun) Need to have a standard way of initializing a network
if network.DefaultFlags == nil {
network.DefaultFlags = make(map[string]string)

Check failure on line 70 in tests/antithesis/compose.go

View workflow job for this annotation

GitHub Actions / Unit (macos-14)

cannot use make(map[string]string) (value of type map[string]string) as tmpnet.FlagsMap value in assignment

Check failure on line 70 in tests/antithesis/compose.go

View workflow job for this annotation

GitHub Actions / Unit (ubuntu-20.04)

cannot use make(map[string]string) (value of type map[string]string) as tmpnet.FlagsMap value in assignment

Check failure on line 70 in tests/antithesis/compose.go

View workflow job for this annotation

GitHub Actions / Unit (ubuntu-22.04)

cannot use make(map[string]string) (value of type map[string]string) as tmpnet.FlagsMap value in assignment

Check failure on line 70 in tests/antithesis/compose.go

View workflow job for this annotation

GitHub Actions / Unit (ubuntu-24.04)

cannot use make(map[string]string) (value of type map[string]string) as tmpnet.FlagsMap value in assignment

Check failure on line 70 in tests/antithesis/compose.go

View workflow job for this annotation

GitHub Actions / Lint

cannot use make(map[string]string) (value of type map[string]string) as tmpnet.FlagsMap value in assignment (typecheck)

Check failure on line 70 in tests/antithesis/compose.go

View workflow job for this annotation

GitHub Actions / Lint

cannot use make(map[string]string) (value of type map[string]string) as tmpnet.FlagsMap value in assignment) (typecheck)

Check failure on line 70 in tests/antithesis/compose.go

View workflow job for this annotation

GitHub Actions / Lint

cannot use make(map[string]string) (value of type map[string]string) as tmpnet.FlagsMap value in assignment) (typecheck)

Check failure on line 70 in tests/antithesis/compose.go

View workflow job for this annotation

GitHub Actions / Lint

cannot use make(map[string]string) (value of type map[string]string) as tmpnet.FlagsMap value in assignment) (typecheck)

Check failure on line 70 in tests/antithesis/compose.go

View workflow job for this annotation

GitHub Actions / Lint

cannot use make(map[string]string) (value of type map[string]string) as tmpnet.FlagsMap value in assignment) (typecheck)

Check failure on line 70 in tests/antithesis/compose.go

View workflow job for this annotation

GitHub Actions / Lint

cannot use make(map[string]string) (value of type map[string]string) as tmpnet.FlagsMap value in assignment (typecheck)

Check failure on line 70 in tests/antithesis/compose.go

View workflow job for this annotation

GitHub Actions / Unit (custom-arm64-jammy)

cannot use make(map[string]string) (value of type map[string]string) as tmpnet.FlagsMap value in assignment

Check failure on line 70 in tests/antithesis/compose.go

View workflow job for this annotation

GitHub Actions / Unit (custom-arm64-noble)

cannot use make(map[string]string) (value of type map[string]string) as tmpnet.FlagsMap value in assignment

Check failure on line 70 in tests/antithesis/compose.go

View workflow job for this annotation

GitHub Actions / Build Antithesis avalanchego images

cannot use make(map[string]string) (value of type map[string]string) as tmpnet.FlagsMap value in assignment

Check failure on line 70 in tests/antithesis/compose.go

View workflow job for this annotation

GitHub Actions / Build Antithesis xsvm images

cannot use make(map[string]string) (value of type map[string]string) as tmpnet.FlagsMap value in assignment
}
network.DefaultFlags[config.PluginDirKey] = pluginDir

if err := initBootstrapDB(network, bootstrapVolumePath); err != nil {
Expand Down
7 changes: 7 additions & 0 deletions tests/fixture/tmpnet/node_process.go
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,13 @@ func (p *NodeProcess) IsHealthy(ctx context.Context) (bool, error) {
if errors.Is(ErrUnrecoverableNodeHealthCheck, err) {
return false, err
}
if err != nil {
p.node.getNetwork().Log.Debug("failed to check node health",
zap.Stringer("nodeID", p.node.NodeID),
zap.Error(err),
)
return false, nil
}
return healthReply.Healthy, nil
}

Expand Down

0 comments on commit 8af3cb9

Please sign in to comment.