Implement test for covering rollout update CHE with Recreate strategy by musienko-maxim · Pull Request #10091 · eclipse-che/che

musienko-maxim · 2018-06-18T14:07:16Z

What does this PR do?

This Pr implement next scenario:
Create a workspace
Send REST request under admin for suspending WS-master
Check that suspend passed properly (validate PREPARING_TO_SHUTDOWN, READY_TO_SHUTDOWN statuses and unavailability the user workspace through UI )
Perform rollout update and wait for RUNNING status of master
Check that deployment version has been incremented properly
Check availability the workspace for user through UI

What issues does this PR fix or reference?

dmytro-ndp · 2018-06-18T14:13:24Z

selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/hotupdate/RecreateUpdate.java

+
+  private int cheDeploymentBeforeRollout;
+
+  private enum WsMasterStauses {


Stauses > Status

dmytro-ndp · 2018-06-18T14:14:33Z

selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/hotupdate/RecreateUpdate.java

+    String restUrlForSuspendingWorkspaces =
+        cheTestApiEndpointUrlProvider.get().toString() + "system/stop";
+    int timeLimitInSecForRecreateingUpdate = 600;
+    int delayBetweenRequest = 6;


Request > Requests

dmytro-ndp · 2018-06-18T14:17:41Z

selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/hotupdate/RecreateUpdate.java

+import org.testng.annotations.Test;
+
+@Test(groups = {TestGroup.OSIO, TestGroup.MULTIUSER})
+public class RecreateUpdate {


RecreateUpdate > RecreateUpdateStrategyTest

dmytro-ndp · 2018-06-18T14:19:52Z

selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/hotupdate/RecreateUpdate.java

+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+@Test(groups = {TestGroup.OSIO, TestGroup.MULTIUSER})


TestGroup.OSIO is for ospenshift.io specific tests, whereas this test is OpenShift specific one.

dmytro-ndp · 2018-06-18T14:21:05Z

selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/hotupdate/RecreateUpdate.java

+    String ocClientRolloutCommand = "rollout latest che";
+    String restUrlForSuspendingWorkspaces =
+        cheTestApiEndpointUrlProvider.get().toString() + "system/stop";
+    int timeLimitInSecForRecreateingUpdate = 600;


Please, check on grammar errors carefully.

Ohrimenko1988 · 2018-06-18T14:23:36Z

...ium/che-selenium-test/src/main/java/org/eclipse/che/selenium/pageobject/ProjectExplorer.java

    waitProjectExplorer(EXPECTED_MESS_IN_CONSOLE_SEC);
  }

+  public void waitProjectExplorerIsNotPresent(int timeout) {


What about "waitProjectExplorerDisappearance()"?

dmytro-ndp · 2018-06-18T14:25:23Z

selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/hotupdate/RecreateUpdate.java

+  public void checkRecreateUpdateStrategy() throws Exception {
+    String ocClientRolloutCommand = "rollout latest che";
+    String restUrlForSuspendingWorkspaces =
+        cheTestApiEndpointUrlProvider.get().toString() + "system/stop";


I would suggest to extract system-specific methods to the separate class with name like org.eclipse.che.selenium.core.client.CheTestSystemClient

Ohrimenko1988 · 2018-06-18T14:27:29Z

selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/hotupdate/RecreateUpdate.java

+
+  private int cheDeploymentBeforeRollout;
+
+  private enum WsMasterStauses {


It looks like useful common enum and maybe it should be stored separately or in related page object.

This enum describes statuses of ws-master on OpenShift . On this moment this one is used in this place. But is we will need this one for other tests, of course we should store this into separate class.

dmytro-ndp · 2018-06-18T14:28:26Z

selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/hotupdate/RecreateUpdate.java

+        parseInt(openShiftCliCommandExecutor.execute(COMMAND_FOR_GETTING_CURRENT_DEPLOYMENT_CHE));
+    // After rollout updating - deployment should be increased on 1. So we previews version +1
+    // should be equal current
+    assertEquals(cheDeploymentAfterRollout, cheDeploymentBeforeRollout += 1);


cheDeploymentBeforeRollout += 1 > cheDeploymentBeforeRollout + 1

dmytro-ndp · 2018-06-18T14:30:12Z

selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/hotupdate/RecreateUpdate.java

+
+    // get current response code - if system is suspended,  we will get IO exception from the
+    // server. This mean that we have suspended status
+    try {


I would suggest to extract system-specific methods to the separate class with name like org.eclipse.che.selenium.core.client.CheTestSystemClient

Ohrimenko1988 · 2018-06-18T14:33:44Z

selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/hotupdate/RecreateUpdate.java

+        parseInt(openShiftCliCommandExecutor.execute(COMMAND_FOR_GETTING_CURRENT_DEPLOYMENT_CHE));
+    // After rollout updating - deployment should be increased on 1. So we previews version +1
+    // should be equal current
+    assertEquals(cheDeploymentAfterRollout, cheDeploymentBeforeRollout += 1);


I think "+=" it is redundant
this condition means: cheDeploymentBeforeRollout = cheDeploymentBeforeRollout + 1
but in my opinion in this case "cheDeploymentBeforeRollout + 1" is enough.

Ohrimenko1988 · 2018-06-18T14:37:09Z

selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/hotupdate/RecreateUpdate.java

+    // open a user workspace and send request for preparing to shutdown
+    ide.open(workspace);
+
+    testUserHttpJsonRequestFactory


In my opinion, incapsulating to the method looks more clear.
Something like:

private void prepareToShutdownRequest(){ String restUrlForSuspendingWorkspaces = cheTestApiEndpointUrlProvider.get().toString() + "system/stop"; testUserHttpJsonRequestFactory .fromUrl(restUrlForSuspendingWorkspaces) .usePostMethod() .request(); }

Ohrimenko1988 · 2018-06-18T14:42:25Z

selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/hotupdate/RecreateUpdate.java

+    // performs rollout
+    openShiftCliCommandExecutor.execute(ocClientRolloutCommand);
+    waitOpenShiftStatus(
+        timeLimitInSecForRecreateingUpdate, delayBetweenRequest, WsMasterStauses.RUNNING);


In all occurrences of this method changes only "WsMasterStauses" argument, so you can rid of extra arguments and left only "WsMasterStauses".

dmytro-ndp · 2018-06-18T15:11:28Z

selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/hotupdate/RecreateUpdate.java

+      throws Exception {
+
+    // if the limit is not exceeded - do request and check status of the system
+    while (maxTimeLimitInSec > 0) {


It could be simplified as follow:

private void waitWorkspaceMasterStatus(int maxReadStatusAttempts, int readStatusTimeoutInSec, WsMasterStatus expectedStatus) throws Exception { int readStatusAttempts = maxReadStatusAttempts; while (readStatusAttempts-- > 0) { if (getCurrentRollingStatus().equals(expectedStatus.toString())) { return; } WaitUtils.sleepQuietly(readStatusTimeoutInSec); } throw new IOException(String.format("Workspace Master hasn't achieved status '%s' in '%' seconds.", status, maxReadStatusAttempts * readStatusTimeoutInSec)); }

Signed-off-by: Dmytro Nochevnov <dnochevnov@codenvy.com>

dmytro-ndp · 2018-06-18T17:16:17Z

ci-test

codenvy-ci · 2018-06-18T22:36:29Z

ci-test build report:
Build details
Test report
selenium tests report data
docker image: eclipseche/che-server:10091
https://github.com/orgs/eclipse/teams/eclipse-che-qa please check this report.

dmytro-ndp · 2018-06-19T06:12:46Z

...he-selenium-test/src/main/java/org/eclipse/che/selenium/core/client/CheTestSystemClient.java

+        timeLimitForReadyToShutdownStatus, delayBetweenRequestes, READY_TO_SHUTDOWN);
+  }
+
+  public String getCurrentState() throws Exception {


If we return type of WorkspaceMasterStatus here, it can avoid redundant calling of status.toString() method.

Signed-off-by: Dmytro Nochevnov <dnochevnov@codenvy.com>

…eclipse-che#10091) Signed-off-by: Dmytro Nochevnov <dnochevnov@codenvy.com>

musienko-maxim and others added 13 commits June 13, 2018 14:45

Add sceleton for hot update testing

7a0d212

Merge branch 'master' into CHE-9988

329ef7e

Merge branch 'master' of https://github.com/eclipse/che into CHE-9988

0d3b1b8

add new methods and steps

288bab6

Merge branch 'master' into CHE-9988

fd1221b

Create main steps for 'RolloutUpdate' selenium test

4054956

Merge branch 'master' into CHE-9988

6f56773

merhe changes

98a4952

Merge branch 'master' into CHE-9988

a19227b

add methods for working with REST API

e0666a1

fix logic errors, add steps

a261067

reformat code, add new methods and steps

ada149d

remove unnecessary file

bfef13d

musienko-maxim requested a review from vparfonov as a code owner June 18, 2018 14:07

remove unnecessary output

43f5802

benoitf added status/code-review This issue has a pull request posted for it and is awaiting code review completion by the community. kind/task Internal things, technical debt, and to-do tasks to be performed. labels Jun 18, 2018

remove unnecessary comment

5905c27

musienko-maxim requested review from Ohrimenko1988, SkorikSergey and dmytro-ndp June 18, 2018 14:10

dmytro-ndp reviewed Jun 18, 2018

View reviewed changes

Ohrimenko1988 reviewed Jun 18, 2018

View reviewed changes

dmytro-ndp reviewed Jun 18, 2018

View reviewed changes

Ohrimenko1988 reviewed Jun 18, 2018

View reviewed changes

dmytro-ndp reviewed Jun 18, 2018

View reviewed changes

Ohrimenko1988 reviewed Jun 18, 2018

View reviewed changes

Ohrimenko1988 approved these changes Jun 18, 2018

View reviewed changes

dmytro-ndp reviewed Jun 18, 2018

View reviewed changes

musienko-maxim and others added 7 commits June 18, 2018 18:26

Add proposals for the PR, fix typo, improve code fragments

2936f8a

put the system specific methods into separate class

2c43be2

remove unnecessary import

04ab17f

fix method

9495ac3

fix method for waiting status

8937f03

Fix Che test system client

d4d9500

Signed-off-by: Dmytro Nochevnov <dnochevnov@codenvy.com>

Add RecreateUpdateStrategyTest to the CheOneThreadTestsSuite.xml

82677d0

Signed-off-by: Dmytro Nochevnov <dnochevnov@codenvy.com>

dmytro-ndp reviewed Jun 19, 2018

View reviewed changes

Dmytro Nochevnov added 2 commits June 19, 2018 14:48

Make CheTestSystemClient to use SystemStateDto

a570f0e

Signed-off-by: Dmytro Nochevnov <dnochevnov@codenvy.com>

Remove RecreateUpdateStrategyTest from CheOneThreadTestsSuite.xml

808f7b1

Signed-off-by: Dmytro Nochevnov <dnochevnov@codenvy.com>

dmytro-ndp approved these changes Jun 19, 2018

View reviewed changes

SkorikSergey approved these changes Jun 19, 2018

View reviewed changes

Decrease request attempts in RecreateUpdateStrategyTest

8de474c

Signed-off-by: Dmytro Nochevnov <dnochevnov@codenvy.com>

dmytro-ndp merged commit 70bcc8b into master Jun 19, 2018

dmytro-ndp deleted the 9646 branch June 19, 2018 12:16

dmytro-ndp removed the status/code-review This issue has a pull request posted for it and is awaiting code review completion by the community. label Jun 19, 2018

dmytro-ndp added this to the 6.7.0 milestone Jun 19, 2018

Ohrimenko1988 mentioned this pull request Jun 26, 2018

Create E2E test for checking Hot update feature for wsmaster #9646

Closed

hbhargav pushed a commit to hbhargav/che that referenced this pull request Dec 5, 2018

Implement test for covering rollout update CHE with Recreate strategy (…

0921792

…eclipse-che#10091) Signed-off-by: Dmytro Nochevnov <dnochevnov@codenvy.com>


		private int cheDeploymentBeforeRollout;

		private enum WsMasterStauses {

Conversation

musienko-maxim commented Jun 18, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What does this PR do?

What issues does this PR fix or reference?

Uh oh!

dmytro-ndp Jun 18, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

dmytro-ndp Jun 18, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Ohrimenko1988 Jun 18, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

dmytro-ndp Jun 18, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

dmytro-ndp commented Jun 18, 2018

Uh oh!

codenvy-ci commented Jun 18, 2018

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

musienko-maxim commented Jun 18, 2018 •

edited

Loading

dmytro-ndp Jun 18, 2018 •

edited

Loading

dmytro-ndp Jun 18, 2018 •

edited

Loading

Ohrimenko1988 Jun 18, 2018 •

edited

Loading

dmytro-ndp Jun 18, 2018 •

edited

Loading