From 66f1d0cd7829c6d014b24b13d02efac957470ff3 Mon Sep 17 00:00:00 2001
From: Mickael Istria <mistria@redhat.com>
Date: Fri, 17 Nov 2023 15:26:04 +0100
Subject: [PATCH] Abort tests on timeout

---
 Jenkinsfile                                                   | 4 +++-
 .../src/org/eclipse/corrosion/tests/TestLSPExtensions.java    | 4 ++++
 .../src/org/eclipse/corrosion/tests/TestLSPIntegration.java   | 3 +++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 1654c25..a4f820f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -4,7 +4,7 @@ pipeline {
 	}
 	options {
 		buildDiscarder(logRotator(numToKeepStr:'10'))
-		timeout(time: 1, unit: 'HOURS')
+		timeout(time: 30, unit: 'MINUTES')
 	}
 	environment {
 		PATH = "$HOME/.local/bin:$HOME/.cargo/bin/:$PATH"
@@ -31,9 +31,11 @@ pipeline {
 				wrap([$class: 'Xvnc', useXauthority: true]) {
 					sh './mvnw -Dmaven.repo.local=$WORKSPACE/.m2 clean verify -Dmaven.test.error.ignore=true -Dmaven.test.failure.ignore=true -Dtycho.showEclipseLog=true -Psign -Dsurefire.timeout=1800'
 				}
+				sh 'rust-analyzer --version'
 			}
 			post {
 				always {
+					sh 'rust-analyzer --version'
 					junit '*/target/surefire-reports/TEST-*.xml'
 					archiveArtifacts artifacts: '*/target/work/data/.metadata/.log'
 				}
diff --git a/org.eclipse.corrosion.tests/src/org/eclipse/corrosion/tests/TestLSPExtensions.java b/org.eclipse.corrosion.tests/src/org/eclipse/corrosion/tests/TestLSPExtensions.java
index 4d4ff08..26e9762 100644
--- a/org.eclipse.corrosion.tests/src/org/eclipse/corrosion/tests/TestLSPExtensions.java
+++ b/org.eclipse.corrosion.tests/src/org/eclipse/corrosion/tests/TestLSPExtensions.java
@@ -16,6 +16,7 @@
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.time.Duration;
+import java.util.concurrent.TimeUnit;
 
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.jobs.IJobManager;
@@ -24,6 +25,7 @@
 import org.eclipse.corrosion.extensions.ProgressParams;
 import org.eclipse.swt.widgets.Display;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 
 class TestLSPExtensions extends AbstractCorrosionTest {
 
@@ -31,6 +33,7 @@ class TestLSPExtensions extends AbstractCorrosionTest {
 	private static final String PROGRESS_ID_2 = "progress_2";
 
 	@Test
+	@Timeout(value = 3, unit = TimeUnit.MINUTES)
 	void testBuildingMessages() {
 		String jobType = "Building";
 		RLSClientImplementation clientImplementation = new RLSClientImplementation();
@@ -50,6 +53,7 @@ void testBuildingMessages() {
 	}
 
 	@Test
+	@Timeout(value = 3, unit = TimeUnit.MINUTES)
 	void testIndexingMessages() {
 		String jobType = "Indexing";
 		RLSClientImplementation clientImplementation = new RLSClientImplementation();
diff --git a/org.eclipse.corrosion.tests/src/org/eclipse/corrosion/tests/TestLSPIntegration.java b/org.eclipse.corrosion.tests/src/org/eclipse/corrosion/tests/TestLSPIntegration.java
index 00402cd..d704bd1 100644
--- a/org.eclipse.corrosion.tests/src/org/eclipse/corrosion/tests/TestLSPIntegration.java
+++ b/org.eclipse.corrosion.tests/src/org/eclipse/corrosion/tests/TestLSPIntegration.java
@@ -17,6 +17,7 @@
 import java.io.IOException;
 import java.time.Duration;
 import java.util.Arrays;
+import java.util.concurrent.TimeUnit;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IMarker;
@@ -29,10 +30,12 @@
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.ide.IDE;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 
 class TestLSPIntegration extends AbstractCorrosionTest {
 
 	@Test
+	@Timeout(value = 3, unit = TimeUnit.MINUTES)
 	void testLSWorks() throws IOException, CoreException {
 		IProject project = getProject(BASIC_ERRORS_PROJECT_NAME);
 		IWorkbenchPage activePage = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();