commit 92ec4c65152e050dfb5843ef6035328a58ce4307
author Edwin Kempin <ekempin@google.com> Mon Dec 31 06:27:46 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Dec 31 06:27:46 2018 +0000
tree 2c00286f72627c56b9ee82b9964e45ca675ddf90
parent 47fab7fe86ca3e976d0781d733b1f69612cad8af
parent fa795963848f69a9cd22e971b563b8e158e6c939

Merge "Audit: sandbox integration tests for removing flakiness"

java/com/google/gerrit/acceptance/AbstractDaemonTest.java

diff --git a/java/com/google/gerrit/acceptance/AbstractDaemonTest.java b/java/com/google/gerrit/acceptance/AbstractDaemonTest.java
index d77e1a1..5155e6c 100644
--- a/java/com/google/gerrit/acceptance/AbstractDaemonTest.java
+++ b/java/com/google/gerrit/acceptance/AbstractDaemonTest.java
@@ -125,7 +125,6 @@
 import com.google.gerrit.testing.ConfigSuite;
 import com.google.gerrit.testing.FakeEmailSender;
 import com.google.gerrit.testing.FakeEmailSender.Message;
-import com.google.gerrit.testing.FakeGroupAuditService;
 import com.google.gerrit.testing.SshMode;
 import com.google.gson.Gson;
 import com.google.gwtorm.server.OrmException;
@@ -242,7 +241,6 @@
   @Inject protected ChangeNoteUtil changeNoteUtil;
   @Inject protected ChangeResource.Factory changeResourceFactory;
   @Inject protected FakeEmailSender sender;
-  @Inject protected FakeGroupAuditService auditService;
   @Inject protected GerritApi gApi;
   @Inject protected GitRepositoryManager repoManager;
   @Inject protected GroupBackend groupBackend;

javatests/com/google/gerrit/acceptance/git/GitOverHttpServletIT.java

diff --git a/javatests/com/google/gerrit/acceptance/git/GitOverHttpServletIT.java b/javatests/com/google/gerrit/acceptance/git/GitOverHttpServletIT.java
index 90f4134..26ace25 100644
--- a/javatests/com/google/gerrit/acceptance/git/GitOverHttpServletIT.java
+++ b/javatests/com/google/gerrit/acceptance/git/GitOverHttpServletIT.java
@@ -16,8 +16,10 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import com.google.gerrit.acceptance.Sandboxed;
 import com.google.gerrit.server.AuditEvent;
 import com.google.gerrit.server.audit.HttpAuditEvent;
+import com.google.gerrit.testing.FakeGroupAuditService;
 import java.util.Collections;
 import javax.servlet.http.HttpServletResponse;
 import org.eclipse.jgit.transport.CredentialsProvider;
@@ -34,18 +36,19 @@
     CredentialsProvider.setDefault(
         new UsernamePasswordCredentialsProvider(admin.username, admin.httpPassword));
     selectProtocol(AbstractPushForReview.Protocol.HTTP);
-    auditService.clearEvents();
   }
 
   @Test
+  @Sandboxed
   public void receivePackAuditEventLog() throws Exception {
+    FakeGroupAuditService auditService = clearAuditService();
     testRepo
         .git()
         .push()
         .setRemote("origin")
         .setRefSpecs(new RefSpec("HEAD:refs/for/master"))
         .call();
-    waitForAudit();
+    waitForAudit(auditService);
 
     // Git smart protocol makes two requests:
     // https://github.com/git/git/blob/master/Documentation/technical/http-protocol.txt
@@ -59,9 +62,11 @@
   }
 
   @Test
+  @Sandboxed
   public void uploadPackAuditEventLog() throws Exception {
+    FakeGroupAuditService auditService = clearAuditService();
     testRepo.git().fetch().call();
-    waitForAudit();
+    waitForAudit(auditService);
 
     assertThat(auditService.auditEvents.size()).isEqualTo(1);
 
@@ -73,7 +78,14 @@
     assertThat(((HttpAuditEvent) e).httpStatus).isEqualTo(HttpServletResponse.SC_OK);
   }
 
-  private void waitForAudit() throws InterruptedException {
+  private FakeGroupAuditService clearAuditService() {
+    FakeGroupAuditService auditService =
+        server.getTestInjector().getInstance(FakeGroupAuditService.class);
+    auditService.clearEvents();
+    return auditService;
+  }
+
+  private void waitForAudit(FakeGroupAuditService auditService) throws InterruptedException {
     synchronized (auditService.auditEvents) {
       auditService.auditEvents.wait(AUDIT_EVENT_TIMEOUT);
     }