security/hakurei
6
3
Fork 0
Code Issues 11 Pull Requests Actions Packages Projects Releases 11 Wiki Activity

internal/pkg: pass context to file cure
All checks were successful
Test / Create distribution (push) Successful in 47s
Details
Test / Sandbox (push) Successful in 2m52s
Details
Test / ShareFS (push) Successful in 4m42s
Details
Test / Sandbox (race detector) (push) Successful in 5m17s
Details
Test / Hpkg (push) Successful in 5m24s
Details
Test / Hakurei (push) Successful in 5m31s
Details
Test / Hakurei (race detector) (push) Successful in 7m54s
Details
Test / Flake checks (push) Successful in 1m47s
Details

Browse Source 
This removes the left over embedded contexts.

Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
Ophestra
2026-01-09 05:31:38 +09:00
parent f712466714
commit 34cb4ebd3b
7 changed files with 17 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
internal/pkg/net_test.go
View File

@@ -31,13 +31,12 @@ func TestHTTPGet(t *testing.T) {
checkWithCache(t, []cacheTestCase{
{"direct", nil, func(t *testing.T, base *check.Absolute, c *pkg.Cache) {
f := pkg.NewHTTPGet(
t.Context(),
&client,
"file:///testdata",
testdataChecksum,
)
wantIdent := pkg.KindHTTPGet.Ident([]byte("file:///testdata"))
if got, err := f.Cure(); err != nil {
if got, err := f.Cure(t.Context()); err != nil {
t.Fatalf("Cure: error = %v", err)
} else if string(got) != testdata {
t.Fatalf("Cure: %x, want %x", got, testdata)
@@ -47,7 +46,6 @@ func TestHTTPGet(t *testing.T) {
// check direct validation
f = pkg.NewHTTPGet(
t.Context(),
&client,
"file:///testdata",
pkg.Checksum{},
@@ -55,7 +53,7 @@ func TestHTTPGet(t *testing.T) {
wantErrMismatch := &pkg.ChecksumMismatchError{
Got: testdataChecksum,
}
if _, err := f.Cure(); !reflect.DeepEqual(err, wantErrMismatch) {
if _, err := f.Cure(t.Context()); !reflect.DeepEqual(err, wantErrMismatch) {
t.Fatalf("Cure: error = %#v, want %#v", err, wantErrMismatch)
} else if gotIdent := pkg.Ident(f); gotIdent != wantIdent {
t.Fatalf("Ident: %s, want %s", pkg.Encode(gotIdent), pkg.Encode(wantIdent))
@@ -63,14 +61,13 @@ func TestHTTPGet(t *testing.T) {
// check direct response error
f = pkg.NewHTTPGet(
t.Context(),
&client,
"file:///nonexistent",
pkg.Checksum{},
)
wantIdentNonexistent := pkg.KindHTTPGet.Ident([]byte("file:///nonexistent"))
wantErrNotFound := pkg.ResponseStatusError(http.StatusNotFound)
if _, err := f.Cure(); !reflect.DeepEqual(err, wantErrNotFound) {
if _, err := f.Cure(t.Context()); !reflect.DeepEqual(err, wantErrNotFound) {
t.Fatalf("Cure: error = %#v, want %#v", err, wantErrNotFound)
} else if gotIdent := pkg.Ident(f); gotIdent != wantIdentNonexistent {
t.Fatalf("Ident: %s, want %s", pkg.Encode(gotIdent), pkg.Encode(wantIdentNonexistent))
@@ -79,7 +76,6 @@ func TestHTTPGet(t *testing.T) {
{"cure", nil, func(t *testing.T, base *check.Absolute, c *pkg.Cache) {
f := pkg.NewHTTPGet(
t.Context(),
&client,
"file:///testdata",
testdataChecksum,
@@ -97,7 +93,7 @@ func TestHTTPGet(t *testing.T) {
t.Fatalf("Cure: %x, want %x", checksum, testdataChecksum)
}
if got, err := f.Cure(); err != nil {
if got, err := f.Cure(t.Context()); err != nil {
t.Fatalf("Cure: error = %v", err)
} else if string(got) != testdata {
t.Fatalf("Cure: %x, want %x", got, testdata)
@@ -107,12 +103,11 @@ func TestHTTPGet(t *testing.T) {
// check load from cache
f = pkg.NewHTTPGet(
t.Context(),
&client,
"file:///testdata",
testdataChecksum,
)
if got, err := f.Cure(); err != nil {
if got, err := f.Cure(t.Context()); err != nil {
t.Fatalf("Cure: error = %v", err)
} else if string(got) != testdata {
t.Fatalf("Cure: %x, want %x", got, testdata)
@@ -122,7 +117,6 @@ func TestHTTPGet(t *testing.T) {
// check error passthrough
f = pkg.NewHTTPGet(
t.Context(),
&client,
"file:///nonexistent",
pkg.Checksum{},