opendev/gerrit
Code Issues Proposed changes

AbstractDaemonTest: Add user SSH session

Browse Source 
Rename the adminSession and userSession members to adminRestSession
and userRestSession.

Rename sshSession to adminSshSession.  Add userSshSession.

Change-Id: Id705a04317d146cea48b6215e78d8f8ea7fa95a1
This commit is contained in:
David Pursehouse
2016-04-22 18:39:34 +09:00
parent 84cd28a063
commit 8f02dff77f
35 changed files with 199 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/AbstractDaemonTest.java
View File

@@ -201,9 +201,10 @@ public abstract class AbstractDaemonTest {
protected GerritServer server;
protected TestAccount admin;
protected TestAccount user;
protected RestSession adminSession;
protected RestSession userSession;
protected SshSession sshSession;
protected RestSession adminRestSession;
protected RestSession userRestSession;
protected SshSession adminSshSession;
protected SshSession userSshSession;
protected ReviewDb db;
protected Project.NameKey project;
@@ -300,14 +301,18 @@ public abstract class AbstractDaemonTest {
accountCache.evict(admin.getId());
accountCache.evict(user.getId());
adminSession = new RestSession(server, admin);
userSession = new RestSession(server, user);
adminRestSession = new RestSession(server, admin);
userRestSession = new RestSession(server, user);
initSsh(admin);
db = reviewDbProvider.open();
Context ctx = newRequestContext(admin);
Context ctx = newRequestContext(user);
atrScope.set(ctx);
sshSession = ctx.getSession();
sshSession.open();
userSshSession = ctx.getSession();
userSshSession.open();
ctx = newRequestContext(admin);
atrScope.set(ctx);
adminSshSession = ctx.getSession();
adminSshSession.open();
resourcePrefix = UNSAFE_PROJECT_NAME.matcher(
description.getClassName() + "_"
+ description.getMethodName() + "_").replaceAll("");
@@ -423,7 +428,8 @@ public abstract class AbstractDaemonTest {
repo.close();
}
db.close();
sshSession.close();
adminSshSession.close();
userSshSession.close();
if (server != commonServer) {
server.stop();
}