opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.15' into stable-2.16

Browse Source 
* stable-2.15:
  PutHttpPassword: Squash apply methods
  Clarify that account must have a username to be able to set HTTP password

Change-Id: I4146d4a7fc00c855795e537f62c07d98026acaf1
This commit is contained in:
David Pursehouse
2019-05-10 13:52:24 +09:00
parent da21fa5ab2 481a6e5bb9
commit c8b9ee43c3
3 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
javatests/com/google/gerrit/acceptance/api/accounts/AccountIT.java
View File

@@ -2816,6 +2816,16 @@ public class AccountIT extends AbstractDaemonTest {
assertThat(gApi.accounts().id(user.username).setHttpPassword(null)).isNull();
}
@Test
public void cannotGenerateHttpPasswordWhenUsernameIsNotSet() throws Exception {
setApiUser(admin);
int userId = accountCreator.create().id.get();
assertThat(gApi.accounts().id(userId).get().username).isNull();
exception.expect(ResourceConflictException.class);
exception.expectMessage("username");
gApi.accounts().id(userId).generateHttpPassword();
}
private void createDraft(PushOneCommit.Result r, String path, String message) throws Exception {
DraftInput in = new DraftInput();
in.path = path;