KurlesHS/rclone
1
0
Fork 0
forked from TrueCloudLab/rclone
Code Pull requests Activity

cmd/gitannex: When tags do not match, run e2e tests anyway

Browse source 
Issue #7625
This commit is contained in:
Dan McArdle 2024-04-29 10:22:42 -04:00 • committed by Nick Craig-Wood
parent 96703bb31e
commit f26fc8f07c
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cmd/gitannex/e2e_test.go
View file

@ -21,7 +21,7 @@ import (
// checkRcloneBinaryVersion runs whichever rclone is on the PATH and checks // checkRcloneBinaryVersion runs whichever rclone is on the PATH and checks
// whether it reports a version that matches the test's expectations. Returns // whether it reports a version that matches the test's expectations. Returns
// nil when the version is the expected version, otherwise returns an error. // nil when the version is the expected version, otherwise returns an error.
func checkRcloneBinaryVersion() error { func checkRcloneBinaryVersion(t *testing.T) error {
// versionInfo is a subset of information produced by "core/version". // versionInfo is a subset of information produced by "core/version".
type versionInfo struct { type versionInfo struct {
Version string Version string
@ -47,7 +47,8 @@ func checkRcloneBinaryVersion() error {
} }
_, tagString := buildinfo.GetLinkingAndTags() _, tagString := buildinfo.GetLinkingAndTags()
if parsed.GoTags != tagString { if parsed.GoTags != tagString {
return fmt.Errorf("expected tag string %q, but got %q", tagString, parsed.GoTags) // TODO: Skip the test when tags do not match.
t.Logf("expected tag string %q, but got %q. Not skipping!", tagString, parsed.GoTags)
} }
return nil return nil
} }
@ -196,7 +197,7 @@ func skipE2eTestIfNecessary(t *testing.T) {
t.Skipf("GOOS %q is not supported.", runtime.GOOS) t.Skipf("GOOS %q is not supported.", runtime.GOOS)
} }
if err := checkRcloneBinaryVersion(); err != nil { if err := checkRcloneBinaryVersion(t); err != nil {
t.Skipf("Skipping due to rclone version: %s", err) t.Skipf("Skipping due to rclone version: %s", err)
} }