Merge branch 'stable-3.8' into stable-3.9
* stable-3.8:
Roll back batch ref updates on uncaught throwables
Change-Id: I1ec214b0e4e28ba058f243b0bbf5e9b4017ed825
diff --git a/src/test/java/com/gerritforge/gerrit/globalrefdb/validation/Log4jSharedRefLoggerTest.java b/src/test/java/com/gerritforge/gerrit/globalrefdb/validation/Log4jSharedRefLoggerTest.java
index 346edd7..47964cf 100644
--- a/src/test/java/com/gerritforge/gerrit/globalrefdb/validation/Log4jSharedRefLoggerTest.java
+++ b/src/test/java/com/gerritforge/gerrit/globalrefdb/validation/Log4jSharedRefLoggerTest.java
@@ -20,8 +20,8 @@
import com.google.gerrit.acceptance.PushOneCommit;
import com.google.gerrit.entities.RefNames;
import com.google.gerrit.json.OutputFormat;
+import com.google.gerrit.server.Sequence;
import com.google.gerrit.server.config.SitePaths;
-import com.google.gerrit.server.notedb.Sequences;
import com.google.gerrit.server.util.SystemLog;
import com.google.gson.Gson;
import java.io.IOException;
@@ -101,7 +101,7 @@
@Test
public void shouldLogBlobRefs() throws Exception {
Repository allUsersRepo = repoManager.openRepository(allUsers);
- String blobRefName = RefNames.REFS_SEQUENCES + Sequences.NAME_ACCOUNTS;
+ String blobRefName = RefNames.REFS_SEQUENCES + Sequence.NAME_ACCOUNTS;
Ref currRef = allUsersRepo.exactRef(blobRefName);
log4jSharedRefLogger.logRefUpdate(allUsers.get(), currRef, currRef.getObjectId());
diff --git a/src/test/java/com/gerritforge/gerrit/globalrefdb/validation/SharedRefDbBatchRefUpdateTest.java b/src/test/java/com/gerritforge/gerrit/globalrefdb/validation/SharedRefDbBatchRefUpdateTest.java
index 365f382..ca3d57b 100644
--- a/src/test/java/com/gerritforge/gerrit/globalrefdb/validation/SharedRefDbBatchRefUpdateTest.java
+++ b/src/test/java/com/gerritforge/gerrit/globalrefdb/validation/SharedRefDbBatchRefUpdateTest.java
@@ -23,7 +23,7 @@
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
import static org.mockito.Mockito.when;
import com.gerritforge.gerrit.globalrefdb.validation.dfsrefdb.DefaultSharedRefEnforcement;
@@ -48,7 +48,7 @@
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
-@RunWith(MockitoJUnitRunner.class)
+@RunWith(MockitoJUnitRunner.Silent.class)
public class SharedRefDbBatchRefUpdateTest implements RefFixture {
@Mock SharedRefDatabaseWrapper sharedRefDb;
@@ -113,7 +113,7 @@
sharedRefDbRefUpdate = getSharedRefDbBatchRefUpdateWithDefaultPolicyEnforcement();
- verifyZeroInteractions(validationMetrics);
+ verifyNoInteractions(validationMetrics);
}
@Test
