diff options
| -rw-r--r-- | integrations/api_repo_lfs_locks_test.go | 6 | ||||
| -rw-r--r-- | models/lfs_lock.go | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/integrations/api_repo_lfs_locks_test.go b/integrations/api_repo_lfs_locks_test.go index 657933dd5c..6c0aeb1152 100644 --- a/integrations/api_repo_lfs_locks_test.go +++ b/integrations/api_repo_lfs_locks_test.go @@ -104,8 +104,11 @@ func TestAPILFSLocksLogged(t *testing.T) { req := NewRequestWithJSON(t, "POST", fmt.Sprintf("/%s.git/info/lfs/locks", test.repo.FullName()), map[string]string{"path": test.path}) req.Header.Set("Accept", "application/vnd.git-lfs+json") req.Header.Set("Content-Type", "application/vnd.git-lfs+json") - session.MakeRequest(t, req, test.httpResult) + resp := session.MakeRequest(t, req, test.httpResult) if len(test.addTime) > 0 { + var lfsLock api.LFSLockResponse + DecodeJSON(t, resp, &lfsLock) + assert.EqualValues(t, lfsLock.Lock.LockedAt.Format(time.RFC3339), lfsLock.Lock.LockedAt.Format(time.RFC3339Nano)) //locked at should be rounded to second for _, id := range test.addTime { resultsTests[id].locksTimes = append(resultsTests[id].locksTimes, time.Now()) } @@ -124,6 +127,7 @@ func TestAPILFSLocksLogged(t *testing.T) { for i, lock := range lfsLocks.Locks { assert.EqualValues(t, test.locksOwners[i].DisplayName(), lock.Owner.Name) assert.WithinDuration(t, test.locksTimes[i], lock.LockedAt, 3*time.Second) + assert.EqualValues(t, lock.LockedAt.Format(time.RFC3339), lock.LockedAt.Format(time.RFC3339Nano)) //locked at should be rounded to second } req = NewRequestWithJSON(t, "POST", fmt.Sprintf("/%s.git/info/lfs/locks/verify", test.repo.FullName()), map[string]string{}) diff --git a/models/lfs_lock.go b/models/lfs_lock.go index a27a6f495e..c38686796b 100644 --- a/models/lfs_lock.go +++ b/models/lfs_lock.go @@ -56,7 +56,7 @@ func (l *LFSLock) APIFormat() *api.LFSLock { return &api.LFSLock{ ID: strconv.FormatInt(l.ID, 10), Path: l.Path, - LockedAt: l.Created, + LockedAt: l.Created.Round(time.Second), Owner: &api.LFSLockOwner{ Name: l.Owner.DisplayName(), }, |