Merge pull request #13107 from overleaf/em-reenable-swap-job-test

Reenable swap job test in git bridge

GitOrigin-RevId: 4fcef9d1b9a6ef169b14ec490b785daeb80ab418
This commit is contained in:
Eric Mc Sween
2023-05-17 07:17:58 -04:00
committed by Copybot
parent ebbb4fd6d0
commit a5834a0f8c
3 changed files with 11 additions and 8 deletions

View File

@@ -662,11 +662,6 @@ public class WLGitBridgeIntegrationTest {
}
// We skip this test because it now hangs. It relies on the in-memory swap
// job, but we disable the swap job when the noop or in-memory swap store
// are configured. We do that for safety. Such a configuration in a
// production environment would lead to data loss.
@Ignore
@Test
public void wlgbCanSwapProjects(
) throws IOException, GitAPIException, InterruptedException {
@@ -677,7 +672,7 @@ public class WLGitBridgeIntegrationTest {
server.start();
server.setState(states.get("wlgbCanSwapProjects").get("state"));
wlgb = new GitBridgeApp(new String[] {
makeConfigFile(33874, 3874, new SwapJobConfig(1, 0, 0, 250, null))
makeConfigFile(33874, 3874, new SwapJobConfig(1, 0, 0, 250, null, true))
});
wlgb.run();
File rootGitDir = new File(wlgb.config.getRootGitDirectory());
@@ -1099,6 +1094,7 @@ public class WLGitBridgeIntegrationTest {
" \"s3BucketName\": \"com.overleaf.testbucket\"\n" +
" },\n" +
" \"swapJob\": {\n" +
" \"allowUnsafeStores\": true," +
" \"minProjects\": " +
swapCfg.getMinProjects() +
",\n" +