tdsds.com/gitea
tdsds.com/gitea
1
1
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2024-12-22 16:44:26 +00:00
Code Releases Activity

archiver: tests: integrate new WaitForCompletion a little better

Browse Source 
We can use this to wait for archives to come in, rather than spinning and
hoping with a timeout.
This commit is contained in:
Kyle Evans 2020-05-07 19:23:52 -05:00
parent 709c35685e
commit 9fc8bedb56
1 changed files with 11 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
services/archiver/archiver_test.go
View File

@ -49,27 +49,23 @@ func waitForCount(t *testing.T, num int) {
}
func releaseOneEntry(t *testing.T, inFlight []*ArchiveRequest) {
var nowQueued, numQueued int
var numQueued int
numQueued = len(archiveInProgress)
// Release one, then wait up to 10 seconds for it to complete.
queueMutex.Lock()
// Release one, then WaitForCompletion. We'll get signalled when ready.
// This works out to be quick and race-free, as we'll get signalled when the
// archival goroutine proceeds to dequeue the now-complete archive but we
// can't pick up the queue lock again until it's done removing it from
// archiveInProgress. We'll remain waiting on the queue lock in
// WaitForCompletion() until we can safely acquire the lock.
LockQueue()
archiveQueueReleaseCond.Signal()
queueMutex.Unlock()
timeout := time.Now().Add(10 * time.Second)
for {
nowQueued = len(archiveInProgress)
if nowQueued != numQueued || time.Now().After(timeout) {
break
}
}
// Make sure we didn't just timeout.
assert.NotEqual(t, numQueued, nowQueued)
WaitForCompletion()
UnlockQueue()
// Also make sure that we released only one.
assert.Equal(t, numQueued-1, nowQueued)
assert.Equal(t, numQueued-1, len(archiveInProgress))
}
func TestArchive_Basic(t *testing.T) {
@ -187,15 +183,7 @@ func TestArchive_Basic(t *testing.T) {
assert.Equal(t, 2, len(archiveInProgress))
releaseOneEntry(t, inFlight)
assert.Equal(t, 1, len(archiveInProgress))
// Test waiting for completion on one, which should be relatively
// straightforward. We'll hold the queue-lock and release an entry. It will
// wait to acquire the queue lock, which we'll drop when we
// WaitForCompletion(), to be woken up later.
LockQueue()
releaseOneEntry(t, inFlight)
WaitForCompletion()
UnlockQueue()
assert.Equal(t, 0, len(archiveInProgress))
zipReq2 = DeriveRequestFrom(ctx, firstCommit+".zip")