opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-3.3'

Browse Source 
* stable-3.3:
  PG: Remove legacy permission 'publishDrafts'
  Add searching duplicate "external" externalIds only differing in case
  find-duplicate-usernames.sh: add example output of git grep
  Fix empty TopMenu drop down list
  Script to find duplicate usernames only differing in case
  AccountPatchReview mariadb: fix key length
  RepositorySizeQuotaIT: change try/catch to assertThrows
  Enforce repository size on pack rather than on object

Change-Id: I16754b692439091ac151ff4ce5ff865b88b0e18a
This commit is contained in:
David Ostrovsky
2021-03-29 17:23:19 +02:00
parent a1b3c3f089 304975f488
commit b639b3efcd
7 changed files with 79 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
javatests/com/google/gerrit/acceptance/server/quota/RepositorySizeQuotaIT.java
View File

@@ -34,7 +34,7 @@ import com.google.gerrit.server.quota.QuotaBackend;
import com.google.gerrit.server.quota.QuotaResponse;
import com.google.inject.Module;
import java.util.Collections;
import org.eclipse.jgit.api.errors.TooLargeObjectInPackException;
import org.eclipse.jgit.api.errors.TooLargePackException;
import org.eclipse.jgit.api.errors.TransportException;
import org.junit.Before;
import org.junit.Test;
@@ -77,7 +77,7 @@ public class RepositorySizeQuotaIT extends AbstractDaemonTest {
@Test
public void pushWithAvailableTokens() throws Exception {
when(quotaBackendWithResource.availableTokens(REPOSITORY_SIZE_GROUP))
.thenReturn(singletonAggregation(ok(276L)));
.thenReturn(singletonAggregation(ok(277L)));
when(quotaBackendWithResource.requestTokens(eq(REPOSITORY_SIZE_GROUP), anyLong()))
.thenReturn(singletonAggregation(ok()));
when(quotaBackendWithUser.project(project)).thenReturn(quotaBackendWithResource);
@@ -91,12 +91,10 @@ public class RepositorySizeQuotaIT extends AbstractDaemonTest {
when(quotaBackendWithResource.availableTokens(REPOSITORY_SIZE_GROUP))
.thenReturn(singletonAggregation(ok(availableTokens)));
when(quotaBackendWithUser.project(project)).thenReturn(quotaBackendWithResource);
TooLargeObjectInPackException thrown =
assertThrows(TooLargeObjectInPackException.class, () -> pushCommit());
assertThat(thrown).hasMessageThat().contains("Object too large");
assertThat(thrown)
.hasMessageThat()
.contains(String.format("Max object size limit is %d bytes.", availableTokens));
assertThat(assertThrows(TooLargePackException.class, () -> pushCommit()).getMessage())
.contains(
String.format(
"Pack exceeds the limit of %d bytes, rejecting the pack", availableTokens));
}
@Test