opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.16' into stable-3.0

Browse Source 
* stable-2.16:
  AccountManager: Allow to duplicate emails per account
  Replace ${project} in a foreach query (for project dashboards)

Change-Id: I6db2f9e1a672f22c71931a3034bf4ae47bff6d13
This commit is contained in:
David Pursehouse
2019-09-29 10:23:46 +09:00
parent 2d5b342284 2edcdf23e1
commit c5504f202b
6 changed files with 91 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
javatests/com/google/gerrit/acceptance/rest/account/ExternalIdIT.java
View File

@@ -466,6 +466,7 @@ public class ExternalIdIT extends AbstractDaemonTest {
admin.id(),
"admin.other@example.com",
"secret-password"));
insertExtId(ExternalId.createEmail(admin.id(), "admin.other@example.com"));
insertExtId(createExternalIdWithOtherCaseEmail(nextId(scheme, i)));
}
@@ -696,7 +697,7 @@ public class ExternalIdIT extends AbstractDaemonTest {
}
private ExternalId createExternalIdWithDuplicateEmail(String externalId) {
return ExternalId.createWithEmail(ExternalId.Key.parse(externalId), admin.id(), admin.email());
return ExternalId.createWithEmail(ExternalId.Key.parse(externalId), user.id(), admin.email());
}
private ExternalId createExternalIdWithBadPassword(String username) {