mirror of
https://github.com/go-gitea/gitea.git
synced 2024-09-05 23:34:19 -04:00
lfs/lock: round locked_at timestamp to second (#7872)
* lfs/lock: round locked_at timestamp to second * test returned locked_at values * tests: use time RFC3339
This commit is contained in:
parent
a077c9d551
commit
c2c35d169c
@ -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 := 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("Accept", "application/vnd.git-lfs+json")
|
||||||
req.Header.Set("Content-Type", "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 {
|
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 {
|
for _, id := range test.addTime {
|
||||||
resultsTests[id].locksTimes = append(resultsTests[id].locksTimes, time.Now())
|
resultsTests[id].locksTimes = append(resultsTests[id].locksTimes, time.Now())
|
||||||
}
|
}
|
||||||
@ -124,6 +127,7 @@ func TestAPILFSLocksLogged(t *testing.T) {
|
|||||||
for i, lock := range lfsLocks.Locks {
|
for i, lock := range lfsLocks.Locks {
|
||||||
assert.EqualValues(t, test.locksOwners[i].DisplayName(), lock.Owner.Name)
|
assert.EqualValues(t, test.locksOwners[i].DisplayName(), lock.Owner.Name)
|
||||||
assert.WithinDuration(t, test.locksTimes[i], lock.LockedAt, 3*time.Second)
|
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{})
|
req = NewRequestWithJSON(t, "POST", fmt.Sprintf("/%s.git/info/lfs/locks/verify", test.repo.FullName()), map[string]string{})
|
||||||
|
@ -56,7 +56,7 @@ func (l *LFSLock) APIFormat() *api.LFSLock {
|
|||||||
return &api.LFSLock{
|
return &api.LFSLock{
|
||||||
ID: strconv.FormatInt(l.ID, 10),
|
ID: strconv.FormatInt(l.ID, 10),
|
||||||
Path: l.Path,
|
Path: l.Path,
|
||||||
LockedAt: l.Created,
|
LockedAt: l.Created.Round(time.Second),
|
||||||
Owner: &api.LFSLockOwner{
|
Owner: &api.LFSLockOwner{
|
||||||
Name: l.Owner.DisplayName(),
|
Name: l.Owner.DisplayName(),
|
||||||
},
|
},
|
||||||
|
Loading…
Reference in New Issue
Block a user