diff --git a/tests/antithesis/avalanchego/gencomposeconfig/main.go b/tests/antithesis/avalanchego/gencomposeconfig/main.go index 1681ad78e421..dcdd6e8c63c2 100644 --- a/tests/antithesis/avalanchego/gencomposeconfig/main.go +++ b/tests/antithesis/avalanchego/gencomposeconfig/main.go @@ -4,6 +4,8 @@ package main import ( + "os" + "go.uber.org/zap" "github.com/ava-labs/avalanchego/tests" @@ -20,5 +22,6 @@ func main() { tests.NewDefaultLogger("").Fatal("failed to generate compose config", zap.Error(err), ) + os.Exit(1) } } diff --git a/tests/antithesis/xsvm/gencomposeconfig/main.go b/tests/antithesis/xsvm/gencomposeconfig/main.go index 8bed3a982133..b292cf89cefb 100644 --- a/tests/antithesis/xsvm/gencomposeconfig/main.go +++ b/tests/antithesis/xsvm/gencomposeconfig/main.go @@ -4,6 +4,8 @@ package main import ( + "os" + "go.uber.org/zap" "github.com/ava-labs/avalanchego/genesis" @@ -25,5 +27,6 @@ func main() { tests.NewDefaultLogger("").Fatal("failed to generate compose config", zap.Error(err), ) + os.Exit(1) } } diff --git a/tests/e2e/etna/suites.go b/tests/e2e/etna/suites.go index 703249e0abdd..fb033726d6ce 100644 --- a/tests/e2e/etna/suites.go +++ b/tests/e2e/etna/suites.go @@ -29,13 +29,10 @@ var _ = ginkgo.Describe("[Etna]", func() { require.NoError(err) now := time.Now() - msg := "etna is activated" - if !upgrades.IsEtnaActivated(now) { - msg = "etna is not activated" - } - tc.Log().Info(msg, + tc.Log().Info("detected if Etna is activated", zap.Time("now", now), zap.Time("etnaTime", upgrades.EtnaTime), + zap.Bool("isEtnaActivated", upgrades.IsEtnaActivated(now)), ) }) }) diff --git a/tests/fixture/tmpnet/cmd/main.go b/tests/fixture/tmpnet/cmd/main.go index 96859fba4d8f..f8eff5782c51 100644 --- a/tests/fixture/tmpnet/cmd/main.go +++ b/tests/fixture/tmpnet/cmd/main.go @@ -17,6 +17,7 @@ import ( "github.com/ava-labs/avalanchego/tests" "github.com/ava-labs/avalanchego/tests/fixture/tmpnet" + "github.com/ava-labs/avalanchego/utils/logging" "github.com/ava-labs/avalanchego/version" ) @@ -37,7 +38,7 @@ func main() { Short: "tmpnetctl commands", } rootCmd.PersistentFlags().StringVar(&networkDir, "network-dir", os.Getenv(tmpnet.NetworkDirEnvName), "The path to the configuration directory of a temporary network") - rootCmd.PersistentFlags().StringVar(&rawLogFormat, "log-format", "auto", "The structure of log format. Defaults to 'auto' which formats terminal-like logs, when the output is a terminal. Otherwise, should be one of {auto, plain, colors, json}") + rootCmd.PersistentFlags().StringVar(&rawLogFormat, "log-format", logging.AutoString, logging.FormatDescription) versionCmd := &cobra.Command{ Use: "version", diff --git a/tests/log.go b/tests/log.go index 8e6271b8c014..c3aea0d30bfc 100644 --- a/tests/log.go +++ b/tests/log.go @@ -37,7 +37,7 @@ func NewSimpleLogger(writeCloser io.WriteCloser) logging.Logger { } func NewDefaultLogger(prefix string) logging.Logger { - log, err := LoggerForFormat(prefix, "auto") + log, err := LoggerForFormat(prefix, logging.AutoString) if err != nil { // This should never happen since auto is a valid log format panic(err)