From 92d0245bc6f244c2f526afd87bb39b644b04761b Mon Sep 17 00:00:00 2001 From: Arnaud Date: Mon, 27 Oct 2025 10:56:32 +0100 Subject: [PATCH] Small test refactor --- codex/debug_test.go | 73 ++++++--------------------------------------- codex/p2p_test.go | 68 +++-------------------------------------- codex/testutil.go | 8 +++++ 3 files changed, 21 insertions(+), 128 deletions(-) diff --git a/codex/debug_test.go b/codex/debug_test.go index ba4f7b4..b0cc52d 100644 --- a/codex/debug_test.go +++ b/codex/debug_test.go @@ -80,50 +80,10 @@ func TestCodexPeerDebug(t *testing.T) { var bootstrap, node1, node2 *CodexNode var err error - t.Cleanup(func() { - if bootstrap != nil { - if err := bootstrap.Stop(); err != nil { - t.Logf("cleanup bootstrap: %v", err) - } - - if err := bootstrap.Destroy(); err != nil { - t.Logf("cleanup bootstrap: %v", err) - } - } - if node1 != nil { - if err := node1.Stop(); err != nil { - t.Logf("cleanup node1: %v", err) - } - - if err := node1.Destroy(); err != nil { - t.Logf("cleanup node1: %v", err) - } - } - if node2 != nil { - if err := node2.Stop(); err != nil { - t.Logf("cleanup node2: %v", err) - } - - if err := node2.Destroy(); err != nil { - t.Logf("cleanup node2: %v", err) - } - } + bootstrap = newCodexNode(t, Config{ + DiscoveryPort: 8092, }) - bootstrap, err = New(Config{ - DataDir: t.TempDir(), - LogFormat: LogFormatNoColors, - MetricsEnabled: false, - DiscoveryPort: 8092, - }) - if err != nil { - t.Fatalf("Failed to create bootstrap: %v", err) - } - - if err := bootstrap.Start(); err != nil { - t.Fatalf("Failed to start bootstrap: %v", err) - } - spr, err := bootstrap.Spr() if err != nil { t.Fatalf("Failed to get bootstrap spr: %v", err) @@ -131,35 +91,15 @@ func TestCodexPeerDebug(t *testing.T) { bootstrapNodes := []string{spr} - node1, err = New(Config{ - DataDir: t.TempDir(), - LogFormat: LogFormatNoColors, - MetricsEnabled: false, + node1 = newCodexNode(t, Config{ DiscoveryPort: 8090, BootstrapNodes: bootstrapNodes, }) - if err != nil { - t.Fatalf("Failed to create codex: %v", err) - } - if err := node1.Start(); err != nil { - t.Fatalf("Failed to start codex: %v", err) - } - - node2, err = New(Config{ - DataDir: t.TempDir(), - LogFormat: LogFormatNoColors, - MetricsEnabled: false, + node2 = newCodexNode(t, Config{ DiscoveryPort: 8091, BootstrapNodes: bootstrapNodes, }) - if err != nil { - t.Fatalf("Failed to create codex2: %v", err) - } - - if err := node2.Start(); err != nil { - t.Fatalf("Failed to start codex2: %v", err) - } peerId, err := node2.PeerId() if err != nil { @@ -172,9 +112,14 @@ func TestCodexPeerDebug(t *testing.T) { if err == nil { break } + time.Sleep(1 * time.Second) } + if err != nil { + t.Fatalf("CodexPeerDebug call failed: %v", err) + } + if record.PeerId == "" { t.Fatalf("CodexPeerDebug call failed: %v", err) } diff --git a/codex/p2p_test.go b/codex/p2p_test.go index f7d0e64..44106a9 100644 --- a/codex/p2p_test.go +++ b/codex/p2p_test.go @@ -73,50 +73,10 @@ func TestCodexWithPeerId(t *testing.T) { var bootstrap, node1, node2 *CodexNode var err error - t.Cleanup(func() { - if bootstrap != nil { - if err := bootstrap.Stop(); err != nil { - t.Logf("cleanup bootstrap: %v", err) - } - - if err := bootstrap.Destroy(); err != nil { - t.Logf("cleanup bootstrap: %v", err) - } - } - if node1 != nil { - if err := node1.Stop(); err != nil { - t.Logf("cleanup node1: %v", err) - } - - if err := node1.Destroy(); err != nil { - t.Logf("cleanup node1: %v", err) - } - } - if node2 != nil { - if err := node2.Stop(); err != nil { - t.Logf("cleanup node2: %v", err) - } - - if err := node2.Destroy(); err != nil { - t.Logf("cleanup node2: %v", err) - } - } + bootstrap = newCodexNode(t, Config{ + DiscoveryPort: 8092, }) - bootstrap, err = New(Config{ - DataDir: t.TempDir(), - LogFormat: LogFormatNoColors, - MetricsEnabled: false, - DiscoveryPort: 8092, - }) - if err != nil { - t.Fatalf("Failed to create bootstrap: %v", err) - } - - if err := bootstrap.Start(); err != nil { - t.Fatalf("Failed to start bootstrap: %v", err) - } - spr, err := bootstrap.Spr() if err != nil { t.Fatalf("Failed to get bootstrap spr: %v", err) @@ -124,35 +84,15 @@ func TestCodexWithPeerId(t *testing.T) { bootstrapNodes := []string{spr} - node1, err = New(Config{ - DataDir: t.TempDir(), - LogFormat: LogFormatNoColors, - MetricsEnabled: false, + node1 = newCodexNode(t, Config{ DiscoveryPort: 8090, BootstrapNodes: bootstrapNodes, }) - if err != nil { - t.Fatalf("Failed to create codex: %v", err) - } - if err := node1.Start(); err != nil { - t.Fatalf("Failed to start codex: %v", err) - } - - node2, err = New(Config{ - DataDir: t.TempDir(), - LogFormat: LogFormatNoColors, - MetricsEnabled: false, + node2 = newCodexNode(t, Config{ DiscoveryPort: 8091, BootstrapNodes: bootstrapNodes, }) - if err != nil { - t.Fatalf("Failed to create codex2: %v", err) - } - - if err := node2.Start(); err != nil { - t.Fatalf("Failed to start codex2: %v", err) - } peerId, err := node2.PeerId() if err != nil { diff --git a/codex/testutil.go b/codex/testutil.go index 7521be4..274495b 100644 --- a/codex/testutil.go +++ b/codex/testutil.go @@ -35,6 +35,14 @@ func newCodexNode(t *testing.T, opts ...Config) *CodexNode { if c.LogFile != "" { config.LogFile = c.LogFile } + + if len(c.BootstrapNodes) != 0 { + config.BootstrapNodes = c.BootstrapNodes + } + + if c.DiscoveryPort != 0 { + config.DiscoveryPort = c.DiscoveryPort + } } node, err := New(config)