diff options
| author | Pavlo Strokov <pstrokov@gitlab.com> | 2021-11-18 13:18:04 +0300 |
|---|---|---|
| committer | Pavlo Strokov <pstrokov@gitlab.com> | 2021-11-18 13:18:04 +0300 |
| commit | b6dda5d1f7a7e05c34ed0f72f161a46aee536d75 (patch) | |
| tree | 4006d7f63f52559c6bf7aa3bf206b3c886436b8a | |
| parent | 0dba5bd4b2123b80edfa27f33ff8833036e94814 (diff) | |
| parent | e378bdd7f2a2be0883a5f4ac95c2108da7f84350 (diff) | |
Merge branch 'fix_find_all_tags_locally' into 'master'
Fix FindAllTags test with hardcoded timezone
See merge request gitlab-org/gitaly!4093
| -rw-r--r-- | internal/gitaly/service/ref/find_all_tags_test.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/internal/gitaly/service/ref/find_all_tags_test.go b/internal/gitaly/service/ref/find_all_tags_test.go index 4e8e8539b..904b086e7 100644 --- a/internal/gitaly/service/ref/find_all_tags_test.go +++ b/internal/gitaly/service/ref/find_all_tags_test.go @@ -285,6 +285,7 @@ func TestFindAllTags_duplicateAnnotatedTags(t *testing.T) { commitID := gittest.WriteCommit(t, cfg, repoPath, gittest.WithParents()) date := time.Unix(12345, 0) + dateOffset := date.Format("-0700") tagID, err := repo.WriteTag(ctx, commitID, "commit", []byte("annotated"), []byte("message"), gittest.TestUser, date) @@ -334,7 +335,7 @@ func TestFindAllTags_duplicateAnnotatedTags(t *testing.T) { Name: gittest.TestUser.Name, Email: gittest.TestUser.Email, Date: timestamppb.New(date), - Timezone: []byte("+0000"), + Timezone: []byte(dateOffset), }, TargetCommit: commit, }, @@ -347,7 +348,7 @@ func TestFindAllTags_duplicateAnnotatedTags(t *testing.T) { Name: gittest.TestUser.Name, Email: gittest.TestUser.Email, Date: timestamppb.New(date), - Timezone: []byte("+0000"), + Timezone: []byte(dateOffset), }, TargetCommit: commit, }, |