server: allow release version to be set in test (#3517)

The old logic made it impossible for the caller to set
the release version with WithReleaseVersion. Only
set the release version when it's not explicitly set already.
This commit is contained in:
Johan Brandhorst-Satzkorn authored and GitHub committed 2023-07-31 09:41:22 -07:00
1 parent ef3954c561
commit c644396916
1 file changed
+6 -4
+6 -4
View File
@@ -114,10 +114,12 @@ func TestKmsWorker(t *testing.T, conn *db.DB, wrapper wrapping.Wrapper, opt ...O
address := "127.0.0.1"
opt = append(opt, WithAddress(address))
}
versionInfo := version.Get()
relVer := versionInfo.FullVersionNumber(false)
opt = append(opt, WithReleaseVersion(relVer))
if opts.withReleaseVersion == "" {
// Only set the release version if it isn't already set
versionInfo := version.Get()
relVer := versionInfo.FullVersionNumber(false)
opt = append(opt, WithReleaseVersion(relVer))
}
wrk := NewWorker(scope.Global.String(), opt...)
wrk, err = serversRepo.UpsertWorkerStatus(ctx, wrk)