Skip to content

Commit 92d0245

Browse files
2-towns2-towns
committed
Small test refactor
1 parent f184f0d commit 92d0245

File tree

3 files changed

+21
-128
lines changed

3 files changed

+21
-128
lines changed

‎codex/debug_test.go‎

Lines changed: 9 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -80,86 +80,26 @@ func TestCodexPeerDebug(t *testing.T) {
8080
var bootstrap, node1, node2 *CodexNode
8181
var err error
8282

83-
t.Cleanup(func() {
84-
if bootstrap != nil {
85-
if err := bootstrap.Stop(); err != nil {
86-
t.Logf("cleanup bootstrap: %v", err)
87-
}
88-
89-
if err := bootstrap.Destroy(); err != nil {
90-
t.Logf("cleanup bootstrap: %v", err)
91-
}
92-
}
93-
if node1 != nil {
94-
if err := node1.Stop(); err != nil {
95-
t.Logf("cleanup node1: %v", err)
96-
}
97-
98-
if err := node1.Destroy(); err != nil {
99-
t.Logf("cleanup node1: %v", err)
100-
}
101-
}
102-
if node2 != nil {
103-
if err := node2.Stop(); err != nil {
104-
t.Logf("cleanup node2: %v", err)
105-
}
106-
107-
if err := node2.Destroy(); err != nil {
108-
t.Logf("cleanup node2: %v", err)
109-
}
110-
}
83+
bootstrap = newCodexNode(t, Config{
84+
DiscoveryPort: 8092,
11185
})
11286

113-
bootstrap, err = New(Config{
114-
DataDir: t.TempDir(),
115-
LogFormat: LogFormatNoColors,
116-
MetricsEnabled: false,
117-
DiscoveryPort: 8092,
118-
})
119-
if err != nil {
120-
t.Fatalf("Failed to create bootstrap: %v", err)
121-
}
122-
123-
if err := bootstrap.Start(); err != nil {
124-
t.Fatalf("Failed to start bootstrap: %v", err)
125-
}
126-
12787
spr, err := bootstrap.Spr()
12888
if err != nil {
12989
t.Fatalf("Failed to get bootstrap spr: %v", err)
13090
}
13191

13292
bootstrapNodes := []string{spr}
13393

134-
node1, err = New(Config{
135-
DataDir: t.TempDir(),
136-
LogFormat: LogFormatNoColors,
137-
MetricsEnabled: false,
94+
node1 = newCodexNode(t, Config{
13895
DiscoveryPort: 8090,
13996
BootstrapNodes: bootstrapNodes,
14097
})
141-
if err != nil {
142-
t.Fatalf("Failed to create codex: %v", err)
143-
}
14498

145-
if err := node1.Start(); err != nil {
146-
t.Fatalf("Failed to start codex: %v", err)
147-
}
148-
149-
node2, err = New(Config{
150-
DataDir: t.TempDir(),
151-
LogFormat: LogFormatNoColors,
152-
MetricsEnabled: false,
99+
node2 = newCodexNode(t, Config{
153100
DiscoveryPort: 8091,
154101
BootstrapNodes: bootstrapNodes,
155102
})
156-
if err != nil {
157-
t.Fatalf("Failed to create codex2: %v", err)
158-
}
159-
160-
if err := node2.Start(); err != nil {
161-
t.Fatalf("Failed to start codex2: %v", err)
162-
}
163103

164104
peerId, err := node2.PeerId()
165105
if err != nil {
@@ -172,9 +112,14 @@ func TestCodexPeerDebug(t *testing.T) {
172112
if err == nil {
173113
break
174114
}
115+
175116
time.Sleep(1 * time.Second)
176117
}
177118

119+
if err != nil {
120+
t.Fatalf("CodexPeerDebug call failed: %v", err)
121+
}
122+
178123
if record.PeerId == "" {
179124
t.Fatalf("CodexPeerDebug call failed: %v", err)
180125
}

‎codex/p2p_test.go‎

Lines changed: 4 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -73,49 +73,9 @@ func TestCodexWithPeerId(t *testing.T) {
7373
var bootstrap, node1, node2 *CodexNode
7474
var err error
7575

76-
t.Cleanup(func() {
77-
if bootstrap != nil {
78-
if err := bootstrap.Stop(); err != nil {
79-
t.Logf("cleanup bootstrap: %v", err)
80-
}
81-
82-
if err := bootstrap.Destroy(); err != nil {
83-
t.Logf("cleanup bootstrap: %v", err)
84-
}
85-
}
86-
if node1 != nil {
87-
if err := node1.Stop(); err != nil {
88-
t.Logf("cleanup node1: %v", err)
89-
}
90-
91-
if err := node1.Destroy(); err != nil {
92-
t.Logf("cleanup node1: %v", err)
93-
}
94-
}
95-
if node2 != nil {
96-
if err := node2.Stop(); err != nil {
97-
t.Logf("cleanup node2: %v", err)
98-
}
99-
100-
if err := node2.Destroy(); err != nil {
101-
t.Logf("cleanup node2: %v", err)
102-
}
103-
}
104-
})
105-
106-
bootstrap, err = New(Config{
107-
DataDir: t.TempDir(),
108-
LogFormat: LogFormatNoColors,
109-
MetricsEnabled: false,
110-
DiscoveryPort: 8092,
76+
bootstrap = newCodexNode(t, Config{
77+
DiscoveryPort: 8092,
11178
})
112-
if err != nil {
113-
t.Fatalf("Failed to create bootstrap: %v", err)
114-
}
115-
116-
if err := bootstrap.Start(); err != nil {
117-
t.Fatalf("Failed to start bootstrap: %v", err)
118-
}
11979

12080
spr, err := bootstrap.Spr()
12181
if err != nil {
@@ -124,35 +84,15 @@ func TestCodexWithPeerId(t *testing.T) {
12484

12585
bootstrapNodes := []string{spr}
12686

127-
node1, err = New(Config{
128-
DataDir: t.TempDir(),
129-
LogFormat: LogFormatNoColors,
130-
MetricsEnabled: false,
87+
node1 = newCodexNode(t, Config{
13188
DiscoveryPort: 8090,
13289
BootstrapNodes: bootstrapNodes,
13390
})
134-
if err != nil {
135-
t.Fatalf("Failed to create codex: %v", err)
136-
}
137-
138-
if err := node1.Start(); err != nil {
139-
t.Fatalf("Failed to start codex: %v", err)
140-
}
14191

142-
node2, err = New(Config{
143-
DataDir: t.TempDir(),
144-
LogFormat: LogFormatNoColors,
145-
MetricsEnabled: false,
92+
node2 = newCodexNode(t, Config{
14693
DiscoveryPort: 8091,
14794
BootstrapNodes: bootstrapNodes,
14895
})
149-
if err != nil {
150-
t.Fatalf("Failed to create codex2: %v", err)
151-
}
152-
153-
if err := node2.Start(); err != nil {
154-
t.Fatalf("Failed to start codex2: %v", err)
155-
}
15696

15797
peerId, err := node2.PeerId()
15898
if err != nil {

‎codex/testutil.go‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,14 @@ func newCodexNode(t *testing.T, opts ...Config) *CodexNode {
3535
if c.LogFile != "" {
3636
config.LogFile = c.LogFile
3737
}
38+
39+
if len(c.BootstrapNodes) != 0 {
40+
config.BootstrapNodes = c.BootstrapNodes
41+
}
42+
43+
if c.DiscoveryPort != 0 {
44+
config.DiscoveryPort = c.DiscoveryPort
45+
}
3846
}
3947

4048
node, err := New(config)

0 commit comments

Comments
 (0)