seg_yinzy
/
che-server
mirror of https://github.com/eclipse-che/che-server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix name 

Signed-off-by: Tom George <tgeorge@redhat.com>
7.20.x
Tom George 2020-07-07 18:05:54 -05:00
parent a379daf78e
commit 97faa8d1b4
No known key found for this signature in database
GPG Key ID: 5EA5B2F05A51EF05
6 changed files with 3 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
multiuser/api/che-multiuser-api-workspace-activity/src/test/java/org/eclipse/che/multiuser/api/workspace/activity/MultiUserWorkspaceActivityManagerTest.java
View File

@ -35,7 +35,7 @@ import org.testng.annotations.Test;
public class MultiUserWorkspaceActivityManagerTest {
private static final long DEFAULT_TIMEOUT = 60_000L; // 1 minute
private static final long USER_LIMIT_TIMEOUT = 120_000L; // 2 minutes
private static final long DEFAULT_HARD_EXPIRATION_TIMEOUT = 60000 * 60 * 3; // 3 hours
private static final long DEFAULT_RUN_TIMEOUT = 0; // No default run timeout
@Mock private AccountManager accountManager;
@Mock private ResourceManager resourceManager;
@ -60,7 +60,7 @@ public class MultiUserWorkspaceActivityManagerTest {
accountManager,
resourceManager,
DEFAULT_TIMEOUT,
DEFAULT_HARD_EXPIRATION_TIMEOUT);
DEFAULT_RUN_TIMEOUT);
when(account.getId()).thenReturn("account123");
when(accountManager.getByName(anyString())).thenReturn(account);

2
wsmaster/che-core-api-workspace-activity/src/main/java/org/eclipse/che/api/workspace/activity/InmemoryWorkspaceActivityDao.java
View File

@ -50,7 +50,7 @@ public class InmemoryWorkspaceActivityDao implements WorkspaceActivityDao {
.filter(
a ->
(a.getExpiration() != null && a.getExpiration() < timestamp)
|| (runTimeout > 0 && a.getLastRunning() - a.getLastStarting() > runTimeout))
|| (runTimeout > 0 && timestamp - a.getLastRunning() > runTimeout))
.map(WorkspaceActivity::getWorkspaceId)
.collect(toList());
}

5
wsmaster/che-core-api-workspace-activity/src/main/java/org/eclipse/che/api/workspace/activity/WorkspaceActivity.java
View File

@ -169,10 +169,6 @@ public class WorkspaceActivity {
this.expiration = expiration;
}
public Long getRunTimeout() {
return this.lastRunning - this.lastStarting;
}
public WorkspaceStatus getStatus() {
return status;
}
@ -189,7 +185,6 @@ public class WorkspaceActivity {
if (o == null || getClass() != o.getClass()) {
return false;
}
WorkspaceActivity activity = (WorkspaceActivity) o;
return Objects.equals(workspaceId, activity.workspaceId)
&& Objects.equals(created, activity.created)

1
wsmaster/che-core-api-workspace-activity/src/test/java/org/eclipse/che/api/workspace/activity/WorkspaceActivityCheckerTest.java
View File

@ -56,7 +56,6 @@ import org.testng.annotations.Test;
public class WorkspaceActivityCheckerTest {
private static final long DEFAULT_TIMEOUT = 60_000L; // 1 minute
private static final long DEFAULT_RUN_TIMEOUT = 0; // No default run timeout
private static final long ACTIVE_RUN_TIMEOUT = 60000 * 60 * 3; // 3 hours
private ManualClock clock;
private WorkspaceActivityChecker checker;

14
wsmaster/che-core-api-workspace-activity/src/test/java/org/eclipse/che/api/workspace/activity/WorkspaceActivityManagerTest.java
View File

@ -50,7 +50,6 @@ public class WorkspaceActivityManagerTest {
private static final long DEFAULT_TIMEOUT = 60_000L; // 1 minute
private static final long DEFAULT_RUN_TIMEOUT = 0; // No run timeout
private static final long ACTIVE_RUN_TIMEOUT = 60000 * 60 * 3; // 3 hours
@Mock private WorkspaceManager workspaceManager;
@ -108,19 +107,6 @@ public class WorkspaceActivityManagerTest {
assertEquals(wsIdCaptor.getValue(), wsId);
}
@Test
public void shouldRemoveRunTimeoutWhenWorkspaceStopped() throws Exception {
final String wsId = "testWsId";
final EventSubscriber<WorkspaceStatusEvent> subscriber = subscribeAndGetStatusEventSubscriber();
subscriber.onEvent(
DtoFactory.newDto(WorkspaceStatusEvent.class)
.withStatus(WorkspaceStatus.STOPPED)
.withWorkspaceId(wsId));
ArgumentCaptor<String> wsIdCaptor = ArgumentCaptor.forClass(String.class);
verify(workspaceActivityDao, times(1)).removeExpiration(wsIdCaptor.capture());
}
@Test
public void shouldCeaseToTrackTheWorkspaceActivityAfterStopping() throws Exception {
final String wsId = "testWsId";

1
wsmaster/che-core-api-workspace-activity/src/test/java/org/eclipse/che/api/workspace/activity/spi/tck/WorkspaceActivityDaoTest.java
View File

@ -96,7 +96,6 @@ public class WorkspaceActivityDaoTest {
a.setExpiration(base * 1_000_000);
activities[i] = a;
System.out.println("activity is " + a);
}
accountTckRepository.createAll(asList(accounts));