Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'internal/service/commit/between_test.go')
-rw-r--r--internal/service/commit/between_test.go52
1 files changed, 30 insertions, 22 deletions
diff --git a/internal/service/commit/between_test.go b/internal/service/commit/between_test.go
index cc4d14c64..78f678aaf 100644
--- a/internal/service/commit/between_test.go
+++ b/internal/service/commit/between_test.go
@@ -32,14 +32,16 @@ func TestSuccessfulCommitsBetween(t *testing.T) {
Subject: []byte("Merge branch 'branch-merged' into 'master'"),
Body: []byte("Merge branch 'branch-merged' into 'master'\r\n\r\nadds bar folder and branch-test text file to check Repository merged_to_root_ref method\r\n\r\n\r\n\r\nSee merge request !12"),
Author: &gitalypb.CommitAuthor{
- Name: []byte("Job van der Voort"),
- Email: []byte("job@gitlab.com"),
- Date: &timestamp.Timestamp{Seconds: 1474987066},
+ Name: []byte("Job van der Voort"),
+ Email: []byte("job@gitlab.com"),
+ Date: &timestamp.Timestamp{Seconds: 1474987066},
+ Timezone: []byte("+0000"),
},
Committer: &gitalypb.CommitAuthor{
- Name: []byte("Job van der Voort"),
- Email: []byte("job@gitlab.com"),
- Date: &timestamp.Timestamp{Seconds: 1474987066},
+ Name: []byte("Job van der Voort"),
+ Email: []byte("job@gitlab.com"),
+ Date: &timestamp.Timestamp{Seconds: 1474987066},
+ Timezone: []byte("+0000"),
},
ParentIds: []string{
"1b12f15a11fc6e62177bef08f47bc7b5ce50b141",
@@ -52,14 +54,16 @@ func TestSuccessfulCommitsBetween(t *testing.T) {
Subject: []byte("Update README.md to include `Usage in testing and development`"),
Body: []byte("Update README.md to include `Usage in testing and development`"),
Author: &gitalypb.CommitAuthor{
- Name: []byte("Luke \"Jared\" Bennett"),
- Email: []byte("lbennett@gitlab.com"),
- Date: &timestamp.Timestamp{Seconds: 1491905339},
+ Name: []byte("Luke \"Jared\" Bennett"),
+ Email: []byte("lbennett@gitlab.com"),
+ Date: &timestamp.Timestamp{Seconds: 1491905339},
+ Timezone: []byte("+0000"),
},
Committer: &gitalypb.CommitAuthor{
- Name: []byte("Luke \"Jared\" Bennett"),
- Email: []byte("lbennett@gitlab.com"),
- Date: &timestamp.Timestamp{Seconds: 1491905339},
+ Name: []byte("Luke \"Jared\" Bennett"),
+ Email: []byte("lbennett@gitlab.com"),
+ Date: &timestamp.Timestamp{Seconds: 1491905339},
+ Timezone: []byte("+0000"),
},
ParentIds: []string{"b83d6e391c22777fca1ed3012fce84f633d7fed0"},
BodySize: 62,
@@ -69,14 +73,16 @@ func TestSuccessfulCommitsBetween(t *testing.T) {
Subject: []byte("Merge branch 'gitlab-test-usage-dev-testing-docs' into 'master'"),
Body: []byte("Merge branch 'gitlab-test-usage-dev-testing-docs' into 'master'\r\n\r\nUpdate README.md to include `Usage in testing and development`\r\n\r\nSee merge request !21"),
Author: &gitalypb.CommitAuthor{
- Name: []byte("Sean McGivern"),
- Email: []byte("sean@mcgivern.me.uk"),
- Date: &timestamp.Timestamp{Seconds: 1491906794},
+ Name: []byte("Sean McGivern"),
+ Email: []byte("sean@mcgivern.me.uk"),
+ Date: &timestamp.Timestamp{Seconds: 1491906794},
+ Timezone: []byte("+0000"),
},
Committer: &gitalypb.CommitAuthor{
- Name: []byte("Sean McGivern"),
- Email: []byte("sean@mcgivern.me.uk"),
- Date: &timestamp.Timestamp{Seconds: 1491906794},
+ Name: []byte("Sean McGivern"),
+ Email: []byte("sean@mcgivern.me.uk"),
+ Date: &timestamp.Timestamp{Seconds: 1491906794},
+ Timezone: []byte("+0000"),
},
ParentIds: []string{
"b83d6e391c22777fca1ed3012fce84f633d7fed0",
@@ -92,12 +98,14 @@ func TestSuccessfulCommitsBetween(t *testing.T) {
Name: []byte("Alejandro Rodríguez"),
Email: []byte("alejorro70@gmail.com"),
// Not the actual commit date, but the biggest we can represent
- Date: &timestamp.Timestamp{Seconds: 9223371974719179007},
+ Date: &timestamp.Timestamp{Seconds: 9223371974719179007},
+ Timezone: []byte("+0000"),
},
Committer: &gitalypb.CommitAuthor{
- Name: []byte("Alejandro Rodríguez"),
- Email: []byte("alejorro70@gmail.com"),
- Date: &timestamp.Timestamp{Seconds: 9223371974719179007},
+ Name: []byte("Alejandro Rodríguez"),
+ Email: []byte("alejorro70@gmail.com"),
+ Date: &timestamp.Timestamp{Seconds: 9223371974719179007},
+ Timezone: []byte("+0000"),
},
ParentIds: []string{"e63f41fe459e62e1228fcef60d7189127aeba95a"},
BodySize: 18,