From 8af3cb99848158c80981abc58e8fa8c84fecc383 Mon Sep 17 00:00:00 2001 From: Maru Newby Date: Mon, 23 Dec 2024 02:45:13 -0800 Subject: [PATCH] Fix compose and e2e tests --- tests/antithesis/compose.go | 4 ++++ tests/fixture/tmpnet/node_process.go | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/tests/antithesis/compose.go b/tests/antithesis/compose.go index 0a7445fcb785..4d0044a077e0 100644 --- a/tests/antithesis/compose.go +++ b/tests/antithesis/compose.go @@ -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) + } network.DefaultFlags[config.PluginDirKey] = pluginDir if err := initBootstrapDB(network, bootstrapVolumePath); err != nil { diff --git a/tests/fixture/tmpnet/node_process.go b/tests/fixture/tmpnet/node_process.go index 76531bcb6bb0..4c44d647a797 100644 --- a/tests/fixture/tmpnet/node_process.go +++ b/tests/fixture/tmpnet/node_process.go @@ -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 }