Skip to content

Commit 2f2ca2f

Browse files
byobyo
committed
Merge branch 'test-coverage-improvements'
2 parents 05fb8da + 37c9c82 commit 2f2ca2f

21 files changed

Lines changed: 846 additions & 602 deletions

‎.github/workflows/tests.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ jobs:
4242
| grep -v "${PREFIX}/cmd" \
4343
| grep -v "${PREFIX}/testvectors" \
4444
| grep -v "${PREFIX}/pkg/cinodefs/protobuf" \
45+
| grep -v "${PREFIX}/pkg/datastore/testutils/generate" \
4546
)
4647
continue-on-error: ${{ matrix.env['continue-on-error'] }}
4748
- uses: shogo82148/actions-goveralls@v1

‎cmd/static_datastore_builder/main.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright © 2023 Bartłomiej Święcki (byo)
2+
Copyright © 2025 Bartłomiej Święcki (byo)
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.
@@ -17,14 +17,13 @@ limitations under the License.
1717
package main
1818

1919
import (
20-
"context"
2120
"log"
2221

2322
"github.com/cinode/go/pkg/cmd/static_datastore"
2423
)
2524

2625
func main() {
27-
if err := static_datastore.Execute(context.Background()); err != nil {
26+
if err := static_datastore.RootCmd().Execute(); err != nil {
2827
log.Fatal(err.Error())
2928
}
3029
}

‎pkg/blenc/datastore_dynamic_link_test.go‎

Lines changed: 31 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright © 2023 Bartłomiej Święcki (byo)
2+
Copyright © 2025 Bartłomiej Święcki (byo)
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@ import (
2323
"errors"
2424
"fmt"
2525
"io"
26+
"strings"
2627
"testing"
2728
"testing/iotest"
2829

@@ -63,14 +64,18 @@ func TestDynamicLinkErrors(t *testing.T) {
6364
dsw := dsWrapper{DS: datastore.InMemory()}
6465
be := FromDatastore(&dsw)
6566

66-
bn, key, _, err := be.Create(context.Background(), blobtypes.DynamicLink, bytes.NewReader([]byte("Hello world!")))
67+
bn, key, _, err := be.Create(
68+
t.Context(),
69+
blobtypes.DynamicLink,
70+
strings.NewReader("Hello world!"),
71+
)
6772
require.NoError(t, err)
6873

6974
t.Run("handle error while opening blob", func(t *testing.T) {
7075
injectedErr := errors.New("test")
7176
dsw.openFn = func(ctx context.Context, name *common.BlobName) (io.ReadCloser, error) { return nil, injectedErr }
7277

73-
rc, err := be.Open(context.Background(), bn, key)
78+
rc, err := be.Open(t.Context(), bn, key)
7479
require.ErrorIs(t, err, injectedErr)
7580
require.Nil(t, rc)
7681
})
@@ -102,7 +107,7 @@ func TestDynamicLinkErrors(t *testing.T) {
102107
}, nil
103108
}
104109

105-
rc, err := be.Open(context.Background(), bn, key)
110+
rc, err := be.Open(t.Context(), bn, key)
106111
require.ErrorIs(t, err, injectedErr)
107112
require.Nil(t, rc)
108113
require.True(t, closed)
@@ -122,7 +127,11 @@ func TestDynamicLinkErrors(t *testing.T) {
122127

123128
be.(*beDatastore).rand = iotest.ErrReader(injectedErr)
124129

125-
bn, key, ai, err := be.Create(context.Background(), blobtypes.DynamicLink, bytes.NewReader(nil))
130+
bn, key, ai, err := be.Create(
131+
t.Context(),
132+
blobtypes.DynamicLink,
133+
bytes.NewReader(nil),
134+
)
126135
require.ErrorIs(t, err, injectedErr)
127136
require.Empty(t, bn)
128137
require.Empty(t, key)
@@ -137,7 +146,11 @@ func TestDynamicLinkErrors(t *testing.T) {
137146

138147
dsw.updateFn = func(ctx context.Context, name *common.BlobName, r io.Reader) error { return injectedErr }
139148

140-
bn, key, ai, err := be.Create(context.Background(), blobtypes.DynamicLink, bytes.NewReader(nil))
149+
bn, key, ai, err := be.Create(
150+
t.Context(),
151+
blobtypes.DynamicLink,
152+
bytes.NewReader(nil),
153+
)
141154
require.ErrorIs(t, err, injectedErr)
142155
require.Empty(t, bn)
143156
require.Empty(t, key)
@@ -149,12 +162,22 @@ func TestDynamicLinkErrors(t *testing.T) {
149162
t.Run("fail to update new dynamic link blob", func(t *testing.T) {
150163
injectedErr := errors.New("test")
151164

152-
bn, key, ai, err := be.Create(context.Background(), blobtypes.DynamicLink, bytes.NewReader(nil))
165+
bn, key, ai, err := be.Create(
166+
t.Context(),
167+
blobtypes.DynamicLink,
168+
bytes.NewReader(nil),
169+
)
153170
require.NoError(t, err)
154171

155172
dsw.updateFn = func(ctx context.Context, name *common.BlobName, r io.Reader) error { return injectedErr }
156173

157-
err = be.Update(context.Background(), bn, ai, key, bytes.NewReader(nil))
174+
err = be.Update(
175+
t.Context(),
176+
bn,
177+
ai,
178+
key,
179+
bytes.NewReader(nil),
180+
)
158181
require.ErrorIs(t, err, injectedErr)
159182

160183
dsw.updateFn = nil

‎pkg/blenc/datastore_static_test.go‎

Lines changed: 38 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright © 2023 Bartłomiej Święcki (byo)
2+
Copyright © 2025 Bartłomiej Święcki (byo)
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.
@@ -64,14 +64,18 @@ func TestStaticErrorTruncatedDatastore(t *testing.T) {
6464
dsw := dsWrapper{DS: datastore.InMemory()}
6565
be := FromDatastore(&dsw)
6666

67-
bn, key, _, err := be.Create(context.Background(), blobtypes.Static, bytes.NewReader([]byte("Hello world!")))
67+
bn, key, _, err := be.Create(
68+
t.Context(),
69+
blobtypes.Static,
70+
bytes.NewReader([]byte("Hello world!")),
71+
)
6872
require.NoError(t, err)
6973

7074
t.Run("handle error while opening blob", func(t *testing.T) {
7175
injectedErr := errors.New("test")
7276
dsw.openFn = func(ctx context.Context, name *common.BlobName) (io.ReadCloser, error) { return nil, injectedErr }
7377

74-
rc, err := be.Open(context.Background(), bn, key)
78+
rc, err := be.Open(t.Context(), bn, key)
7579
require.ErrorIs(t, err, injectedErr)
7680
require.Nil(t, rc)
7781

@@ -82,7 +86,7 @@ func TestStaticErrorTruncatedDatastore(t *testing.T) {
8286
injectedErr := errors.New("test")
8387
dsw.openFn = func(ctx context.Context, name *common.BlobName) (io.ReadCloser, error) { return nil, injectedErr }
8488

85-
rc, err := be.Open(context.Background(), bn, key)
89+
rc, err := be.Open(t.Context(), bn, key)
8690
require.ErrorIs(t, err, injectedErr)
8791
require.Nil(t, rc)
8892

@@ -95,7 +99,11 @@ func TestStaticErrorTruncatedDatastore(t *testing.T) {
9599
injectedErr := errors.New("test")
96100
be.(*beDatastore).newSecureFifo = func() (securefifo.Writer, error) { return nil, injectedErr }
97101

98-
bn, key, ai, err := be.Create(context.Background(), blobtypes.Static, bytes.NewReader(nil))
102+
bn, key, ai, err := be.Create(
103+
t.Context(),
104+
blobtypes.Static,
105+
bytes.NewReader(nil),
106+
)
99107
require.ErrorIs(t, err, injectedErr)
100108
require.Empty(t, bn)
101109
require.Empty(t, key)
@@ -125,7 +133,11 @@ func TestStaticErrorTruncatedDatastore(t *testing.T) {
125133
}, nil
126134
}
127135

128-
bn, key, ai, err := be.Create(context.Background(), blobtypes.Static, bytes.NewReader(nil))
136+
bn, key, ai, err := be.Create(
137+
t.Context(),
138+
blobtypes.Static,
139+
bytes.NewReader(nil),
140+
)
129141
require.ErrorIs(t, err, injectedErr)
130142
require.Empty(t, bn)
131143
require.Empty(t, key)
@@ -163,7 +175,11 @@ func TestStaticErrorTruncatedDatastore(t *testing.T) {
163175
}, nil
164176
}
165177

166-
bn, key, ai, err := be.Create(context.Background(), blobtypes.Static, bytes.NewReader(nil))
178+
bn, key, ai, err := be.Create(
179+
t.Context(),
180+
blobtypes.Static,
181+
bytes.NewReader(nil),
182+
)
167183
require.ErrorIs(t, err, injectedErr)
168184
require.Empty(t, bn)
169185
require.Empty(t, key)
@@ -202,7 +218,11 @@ func TestStaticErrorTruncatedDatastore(t *testing.T) {
202218
}, nil
203219
}
204220

205-
bn, key, ai, err := be.Create(context.Background(), blobtypes.Static, bytes.NewReader([]byte("Hello world")))
221+
bn, key, ai, err := be.Create(
222+
t.Context(),
223+
blobtypes.Static,
224+
bytes.NewReader([]byte("Hello world")),
225+
)
206226
require.ErrorIs(t, err, injectedErr)
207227
require.Empty(t, bn)
208228
require.Empty(t, key)
@@ -234,7 +254,11 @@ func TestStaticErrorTruncatedDatastore(t *testing.T) {
234254
}, nil
235255
}
236256

237-
bn, key, ai, err := be.Create(context.Background(), blobtypes.Static, iotest.ErrReader(injectedErr))
257+
bn, key, ai, err := be.Create(
258+
t.Context(),
259+
blobtypes.Static,
260+
iotest.ErrReader(injectedErr),
261+
)
238262
require.ErrorIs(t, err, injectedErr)
239263
require.Empty(t, bn)
240264
require.Empty(t, key)
@@ -269,7 +293,11 @@ func TestStaticErrorTruncatedDatastore(t *testing.T) {
269293

270294
dsw.updateFn = func(ctx context.Context, name *common.BlobName, r io.Reader) error { return injectedErr }
271295

272-
bn, key, ai, err := be.Create(context.Background(), blobtypes.Static, bytes.NewReader(nil))
296+
bn, key, ai, err := be.Create(
297+
t.Context(),
298+
blobtypes.Static,
299+
bytes.NewReader(nil),
300+
)
273301
require.ErrorIs(t, err, injectedErr)
274302
require.Empty(t, bn)
275303
require.Empty(t, key)

0 commit comments

Comments
 (0)