From c644396916a8a84c159ac3507c8a533b6b0f0cf8 Mon Sep 17 00:00:00 2001 From: Johan Brandhorst-Satzkorn Date: Mon, 31 Jul 2023 09:41:22 -0700 Subject: [PATCH] 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. --- internal/server/testing.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/internal/server/testing.go b/internal/server/testing.go index a47df6c559..266f5f0ba2 100644 --- a/internal/server/testing.go +++ b/internal/server/testing.go @@ -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)