Make E2E tests screenshots available in report on CI (#10939)

* Make E2E tests screenshots available in report on CI Signed-off-by: Dmytro Nochevnov <dnochevnov@codenvy.com> * Add links to htmldumps, webdriver and workspace logs into the failsafe-report.html Signed-off-by: Dmytro Nochevnov <dnochevnov@codenvy.com> * Fix style for screenshot displaying in the report Signed-off-by: Dmytro Nochevnov <dnochevnov@codenvy.com>
eclipse-che · Aug 30, 2018 · cc06caa · cc06caa
1 parent 2b7ebd8
commit cc06caa
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 8 deletions.
diff --git a/selenium/che-selenium-core/bin/webdriver.sh b/selenium/che-selenium-core/bin/webdriver.sh
@@ -811,11 +811,11 @@ generateFailSafeReport () {
     done
 
     # attach screenshots
-    for f in target/screenshots/*
+    for file in target/site/screenshots/*
     do
-        local test=$(basename ${f} | sed 's/\(.*\)_.*/\1/')
+        local test=$(basename ${file} | sed 's/\(.*\)_.*/\1/')
         local divTag="<div id=\""${test}"error\" style=\"display:none;\">"
-        local imgTag="<img src=\"..\/screenshots\/"$(basename ${f})"\">"
+        local imgTag="<p><img src=\"screenshots\/"$(basename ${file})"\"><p>"
         sed -i "s/${divTag}/${divTag}${imgTag}/" ${FAILSAFE_REPORT}
     done
 
@@ -824,6 +824,25 @@ generateFailSafeReport () {
     echo -e "[TEST] \t${BLUE}file://${CUR_DIR}/${FAILSAFE_REPORT}${NO_COLOUR}"
     echo "[TEST]"
     echo "[TEST]"
+
+    attachLinkToTestReport workspace-logs
+    attachLinkToTestReport webdriver-logs
+    attachLinkToTestReport htmldumps
+}
+
+# first argument - relative path to directory inside target/site
+attachLinkToTestReport() {
+    # attach links to resource related to failed test
+    local relativePathToResource=$1
+    local dirWithResources="target/site/$relativePathToResource/*"
+    for file in $dirWithResources
+    do
+        local test=$(basename ${file} | sed 's/\(.*\)\.zip/\1/' | sed 's/\(.*\)_.*/\1/')
+        local divTag="<div id=\""${test}"error\" style=\"display:none;\">"
+        local filename=$(basename ${file})
+        local aTag="<p><li><a href=\"$relativePathToResource\/$filename\" target=\"_blank\">$relativePathToResource<\/a><\/li><\/p>"
+        sed -i "s/${divTag}/${divTag}${aTag}/" ${FAILSAFE_REPORT}
+    done
 }
 
 storeTestReport() {

diff --git a/...selenium-core/src/main/java/org/eclipse/che/selenium/core/inject/SeleniumTestHandler.java b/...selenium-core/src/main/java/org/eclipse/che/selenium/core/inject/SeleniumTestHandler.java
@@ -42,8 +42,10 @@
 import java.util.stream.Stream;
 import javax.annotation.PreDestroy;
 import javax.validation.constraints.NotNull;
+import org.apache.commons.io.FileUtils;
 import org.eclipse.che.commons.json.JsonParseException;
 import org.eclipse.che.commons.lang.NameGenerator;
+import org.eclipse.che.commons.lang.ZipUtils;
 import org.eclipse.che.selenium.core.SeleniumWebDriver;
 import org.eclipse.che.selenium.core.TestGroup;
 import org.eclipse.che.selenium.core.client.TestGitHubServiceClient;
@@ -369,8 +371,22 @@ private void captureTestWorkspaceLogs(ITestResult result) {
         continue;
       }
 
-      Path pathToStoreWorkspaceLogs = Paths.get(workspaceLogsDir, getTestReference(result));
+      String testReference = getTestReference(result);
+      Path pathToStoreWorkspaceLogs = Paths.get(workspaceLogsDir, testReference);
       testWorkspaceLogsReader.read((TestWorkspace) obj, pathToStoreWorkspaceLogs);
+      Path pathToZipWithWorkspaceLogs =
+          pathToStoreWorkspaceLogs.getParent().resolve(testReference + ".zip");
+
+      try {
+        ZipUtils.zipDir(
+            pathToStoreWorkspaceLogs.toFile().getAbsolutePath(),
+            pathToStoreWorkspaceLogs.toFile(),
+            pathToZipWithWorkspaceLogs.toFile(),
+            null);
+        FileUtils.deleteQuietly(pathToStoreWorkspaceLogs.toFile());
+      } catch (IOException e) {
+        LOG.warn("Error of creation zip-file with workspace logs.", e);
+      }
     }
   }
 

diff --git a/selenium/che-selenium-test/src/test/resources/conf/selenium.properties b/selenium/che-selenium-test/src/test/resources/conf/selenium.properties
@@ -11,10 +11,10 @@
 #
 
 # Directory to store test resources
-tests.screenshots_dir=target/screenshots
-tests.htmldumps_dir=target/htmldumps
-tests.workspacelogs_dir=target/workspace-logs
-tests.webdriverlogs_dir=target/webdriver-logs
+tests.screenshots_dir=target/site/screenshots
+tests.htmldumps_dir=target/site/htmldumps
+tests.workspacelogs_dir=target/site/workspace-logs
+tests.webdriverlogs_dir=target/site/webdriver-logs
 tests.tmp_dir=/tmp
 
 # Che workspace parameters