agw/overleaf-cep
1
0
Fork 0
mirror of https://github.com/yu-i-i/overleaf-cep.git synced 2026-05-31 12:51:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8409 from overleaf/jk-git-bridge-operation-in-progress

Browse Source 
[git-bridge] Operation-in-progress message

GitOrigin-RevId: 2836c3917303f06c7ff2e0b91a36f88237276507
This commit is contained in:
June Kelly
2022-07-12 10:00:28 +01:00
committed by Copybot
parent 2b6b79b1e1
commit c469eaaeaa
10 changed files with 57 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/git-bridge/src/test/java/uk/ac/ic/wlgitbridge/bridge/BridgeTest.java
View File

@@ -13,6 +13,7 @@ import uk.ac.ic.wlgitbridge.bridge.resource.ResourceCache;
import uk.ac.ic.wlgitbridge.bridge.snapshot.SnapshotApiFacade;
import uk.ac.ic.wlgitbridge.bridge.swap.job.SwapJob;
import uk.ac.ic.wlgitbridge.bridge.swap.store.SwapStore;
import uk.ac.ic.wlgitbridge.data.CannotAcquireLockException;
import uk.ac.ic.wlgitbridge.git.exception.GitUserException;
import uk.ac.ic.wlgitbridge.snapshot.getdoc.GetDocResult;
@@ -88,7 +89,7 @@ public class BridgeTest {
@Test
public void updatingRepositorySetsLastAccessedTime(
) throws IOException, GitUserException {
) throws IOException, GitUserException, CannotAcquireLockException {
ProjectRepo repo = mock(ProjectRepo.class);
when(repoStore.getExistingRepo("asdf")).thenReturn(repo);
when(dbStore.getProjectState("asdf")).thenReturn(ProjectState.PRESENT);

3
services/git-bridge/src/test/java/uk/ac/ic/wlgitbridge/bridge/gc/GcJobImplTest.java
View File

@@ -8,6 +8,7 @@ import uk.ac.ic.wlgitbridge.bridge.lock.LockGuard;
import uk.ac.ic.wlgitbridge.bridge.lock.ProjectLock;
import uk.ac.ic.wlgitbridge.bridge.repo.ProjectRepo;
import uk.ac.ic.wlgitbridge.bridge.repo.RepoStore;
import uk.ac.ic.wlgitbridge.data.CannotAcquireLockException;
import uk.ac.ic.wlgitbridge.data.ProjectLockImpl;
import java.io.IOException;
@@ -112,6 +113,8 @@ public class GcJobImplTest {
assertFalse(fut.isDone());
Thread.sleep(1);
}
} catch (CannotAcquireLockException e) {
throw new RuntimeException(e);
}
/* Now that we've released the lock, fut should complete */
fut.join();