1berry/spegel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #402 from spegel-org/update/tests

Browse Source 
Update tests to use spegel-org instead of xenitab
This commit is contained in:
Philip Laine 2024-04-01 21:06:31 +02:00 committed by GitHub
commit e16055663c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -29,6 +29,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- [#383](https://github.com/spegel-org/spegel/pull/383) Bump libp2p to v0.33.0, replace deprecated Pretty function - [#383](https://github.com/spegel-org/spegel/pull/383) Bump libp2p to v0.33.0, replace deprecated Pretty function
- [#397](https://github.com/spegel-org/spegel/pull/397) Replace CopyLayer with GetBlob. - [#397](https://github.com/spegel-org/spegel/pull/397) Replace CopyLayer with GetBlob.
- [#400](https://github.com/spegel-org/spegel/pull/400) Update org imports from xenitab to spegel-org. - [#400](https://github.com/spegel-org/spegel/pull/400) Update org imports from xenitab to spegel-org.
- [#402](https://github.com/spegel-org/spegel/pull/402) Update tests to use spegel-org instead of xenitab.
### Deprecated ### Deprecated

2
pkg/oci/image_test.go
View File

@ -78,6 +78,6 @@ func TestParseImageDigestDoesNotMatch(t *testing.T) {
} }
func TestParseImageNoTagOrDigest(t *testing.T) { func TestParseImageNoTagOrDigest(t *testing.T) {
_, err := Parse("ghcr.io/xenitab/spegel", digest.Digest("")) _, err := Parse("ghcr.io/spegel-org/spegel", digest.Digest(""))
require.EqualError(t, err, "image needs to contain a digest") require.EqualError(t, err, "image needs to contain a digest")
} }

4
pkg/oci/oci_test.go
View File

@ -149,7 +149,7 @@ func TestOCIClient(t *testing.T) {
expectedKeys []string expectedKeys []string
}{ }{
{ {
imageName: "ghcr.io/xenitab/spegel:v0.0.8-with-media-type", imageName: "ghcr.io/spegel-org/spegel:v0.0.8-with-media-type",
imageDigest: "sha256:9506c8e7a2d0a098d43cadfd7ecdc3c91697e8188d3a1245943b669f717747b4", imageDigest: "sha256:9506c8e7a2d0a098d43cadfd7ecdc3c91697e8188d3a1245943b669f717747b4",
expectedKeys: []string{ expectedKeys: []string{
"sha256:9506c8e7a2d0a098d43cadfd7ecdc3c91697e8188d3a1245943b669f717747b4", "sha256:9506c8e7a2d0a098d43cadfd7ecdc3c91697e8188d3a1245943b669f717747b4",
@ -195,7 +195,7 @@ func TestOCIClient(t *testing.T) {
}, },
}, },
{ {
imageName: "ghcr.io/xenitab/spegel:v0.0.8-without-media-type", imageName: "ghcr.io/spegel-org/spegel:v0.0.8-without-media-type",
imageDigest: "sha256:d8df04365d06181f037251de953aca85cc16457581a8fc168f4957c978e1008b", imageDigest: "sha256:d8df04365d06181f037251de953aca85cc16457581a8fc168f4957c978e1008b",
expectedKeys: []string{ expectedKeys: []string{
"sha256:d8df04365d06181f037251de953aca85cc16457581a8fc168f4957c978e1008b", "sha256:d8df04365d06181f037251de953aca85cc16457581a8fc168f4957c978e1008b",

6
pkg/oci/testdata/images.json vendored
View File

@ -5,17 +5,17 @@
"digest": "sha256:9430beb291fa7b96997711fc486bc46133c719631aefdbeebe58dd3489217bfe" "digest": "sha256:9430beb291fa7b96997711fc486bc46133c719631aefdbeebe58dd3489217bfe"
}, },
{ {
"name": "ghcr.io/xenitab/spegel:v0.0.8", "name": "ghcr.io/spegel-org/spegel:v0.0.8",
"mediaType": "application/vnd.oci.image.index.v1+json", "mediaType": "application/vnd.oci.image.index.v1+json",
"digest": "sha256:9506c8e7a2d0a098d43cadfd7ecdc3c91697e8188d3a1245943b669f717747b4" "digest": "sha256:9506c8e7a2d0a098d43cadfd7ecdc3c91697e8188d3a1245943b669f717747b4"
}, },
{ {
"name": "ghcr.io/xenitab/spegel:v0.0.8-with-media-type", "name": "ghcr.io/spegel-org/spegel:v0.0.8-with-media-type",
"mediaType": "application/vnd.oci.image.index.v1+json", "mediaType": "application/vnd.oci.image.index.v1+json",
"digest": "sha256:9506c8e7a2d0a098d43cadfd7ecdc3c91697e8188d3a1245943b669f717747b4" "digest": "sha256:9506c8e7a2d0a098d43cadfd7ecdc3c91697e8188d3a1245943b669f717747b4"
}, },
{ {
"name": "ghcr.io/xenitab/spegel:v0.0.8-without-media-type", "name": "ghcr.io/spegel-org/spegel:v0.0.8-without-media-type",
"mediaType": "application/vnd.oci.image.index.v1+json", "mediaType": "application/vnd.oci.image.index.v1+json",
"digest": "sha256:d8df04365d06181f037251de953aca85cc16457581a8fc168f4957c978e1008b" "digest": "sha256:d8df04365d06181f037251de953aca85cc16457581a8fc168f4957c978e1008b"
}, },

4
pkg/registry/distribution_test.go
View File

@ -45,11 +45,11 @@ func TestParsePathComponents(t *testing.T) {
} }
func TestParsePathComponentsInvalidPath(t *testing.T) { func TestParsePathComponentsInvalidPath(t *testing.T) {
_, _, _, err := parsePathComponents("example.com", "/v2/xenitab/spegel/v0.0.1") _, _, _, err := parsePathComponents("example.com", "/v2/spegel-org/spegel/v0.0.1")
require.EqualError(t, err, "distribution path could not be parsed") require.EqualError(t, err, "distribution path could not be parsed")
} }
func TestParsePathComponentsMissingRegistry(t *testing.T) { func TestParsePathComponentsMissingRegistry(t *testing.T) {
_, _, _, err := parsePathComponents("", "/v2/xenitab/spegel/manifests/v0.0.1") _, _, _, err := parsePathComponents("", "/v2/spegel-org/spegel/manifests/v0.0.1")
require.EqualError(t, err, "registry parameter needs to be set for tag references") require.EqualError(t, err, "registry parameter needs to be set for tag references")
} }

2
pkg/state/state_test.go
View File

@ -29,7 +29,7 @@ func TestBasic(t *testing.T) {
imgRefs := []string{ imgRefs := []string{
"docker.io/library/ubuntu:latest@sha256:b060fffe8e1561c9c3e6dea6db487b900100fc26830b9ea2ec966c151ab4c020", "docker.io/library/ubuntu:latest@sha256:b060fffe8e1561c9c3e6dea6db487b900100fc26830b9ea2ec966c151ab4c020",
"ghcr.io/xenitab/spegel:v0.0.9@sha256:fa32bd3bcd49a45a62cfc1b0fed6a0b63bf8af95db5bad7ec22865aee0a4b795", "ghcr.io/spegel-org/spegel:v0.0.9@sha256:fa32bd3bcd49a45a62cfc1b0fed6a0b63bf8af95db5bad7ec22865aee0a4b795",
"docker.io/library/alpine@sha256:25fad2a32ad1f6f510e528448ae1ec69a28ef81916a004d3629874104f8a7f70", "docker.io/library/alpine@sha256:25fad2a32ad1f6f510e528448ae1ec69a28ef81916a004d3629874104f8a7f70",
} }