thepaperpilot/forgejo
1
0
Fork 0
Code Issues Pull requests Releases Activity Actions 4

archiver: tests: simplify a bit further

Browse source 
We don't need to risk failure and use time.ParseDuration to get 2 *
time.Second.

else if isn't really necessary if the conditions are simple enough and lead
to the same result.
This commit is contained in:
Kyle Evans 2020-05-05 19:13:57 -05:00
parent c134aef340
commit 6b25f43853
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
services/archiver/archiver_test.go
View file

@ -137,8 +137,7 @@ func TestArchive_Basic(t *testing.T) {
ArchiveRepository(zipReq) ArchiveRepository(zipReq)
// Sleep two seconds to make sure the queue doesn't change. // Sleep two seconds to make sure the queue doesn't change.
twoSeconds, _ := time.ParseDuration("2s") time.Sleep(2 * time.Second)
time.Sleep(twoSeconds)
assert.Equal(t, 3, len(archiveInProgress)) assert.Equal(t, 3, len(archiveInProgress))
// Release them all, they'll then stall at the archiveQueueReleaseCond while // Release them all, they'll then stall at the archiveQueueReleaseCond while
@ -150,9 +149,7 @@ func TestArchive_Basic(t *testing.T) {
// 8 second timeout for them all to complete. // 8 second timeout for them all to complete.
timeout := time.Now().Add(8 * time.Second) timeout := time.Now().Add(8 * time.Second)
for { for {
if allComplete(inFlight) { if allComplete(inFlight) || time.Now().After(timeout) {
break
} else if time.Now().After(timeout) {
break break
} }
} }