Merge pull request #5766 from pkriens/issue/5715-indefinitely-waiting…

…-for-tests Moved check for empty queue to top
bndtools · Sep 5, 2023 · d642f12 · d642f12
2 parents abdead0 + 4061cd3
commit d642f12
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 11 deletions.
diff --git a/biz.aQute.tester.junit-platform/src/aQute/tester/junit/platform/Activator.java b/biz.aQute.tester.junit-platform/src/aQute/tester/junit/platform/Activator.java
@@ -338,19 +338,29 @@ public void removedBundle(Bundle bundle, BundleEvent event, Bundle object) {
 
 		trace("starting queue");
 		long result = 0;
+		long timeout = continuous ? Long.MAX_VALUE : 5000;
 		while (active()) {
 			try {
 				List<DiscoverySelector> selectors = new ArrayList<>();
-				for (DiscoverySelector selector = queue.takeFirst(); //
+
+				//
+				// it would be more logical to check for an empty queue here
+				// and !continuous but many tests cases assume that we
+				// will wait for at least 1 test case.
+				//
+
+				for (DiscoverySelector selector = queue.pollFirst(timeout, TimeUnit.MILLISECONDS); //
 					selector != null; //
 					selector = queue.pollFirst(100, TimeUnit.MILLISECONDS)) {
 					selectors.add(selector);
 					queue.drainTo(selectors);
 				}
-				LauncherDiscoveryRequest testRequest = buildRequest(selectors);
-				trace("test will run");
-				result += test(testRequest);
-				trace("test ran");
+				if (!selectors.isEmpty()) {
+					LauncherDiscoveryRequest testRequest = buildRequest(selectors);
+					trace("test will run");
+					result += test(testRequest);
+					trace("test ran");
+				}
 				if (queue.isEmpty() && !continuous) {
 					trace("queue %s", queue);
 					BndSystem.exit((int) result);

diff --git a/biz.aQute.tester/src/aQute/junit/Activator.java b/biz.aQute.tester/src/aQute/junit/Activator.java
@@ -33,6 +33,7 @@
 import java.util.Set;
 import java.util.concurrent.BlockingDeque;
 import java.util.concurrent.LinkedBlockingDeque;
+import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
 import java.util.regex.Pattern;
 import java.util.stream.Stream;
@@ -258,14 +259,24 @@ public void removedBundle(Bundle bundle, BundleEvent event, Bundle object) {
 
 		trace("starting queue");
 		int result = 0;
+		long timeout = continuous ? Long.MAX_VALUE : 5000;
 		while (active()) {
 			try {
-				Bundle bundle = queue.takeFirst();
-				trace("received bundle to test: %s", bundle.getLocation());
-				try (Writer report = getReportWriter(reportDir, bundleReportName(bundle))) {
-					trace("test will run");
-					result += test(bundle, testCases(bundle), report);
-					trace("test ran");
+
+				//
+				// it would be more logical to check for an empty queue here
+				// and !continuous but many tests cases assume that we
+				// will wait for at least 1 test case.
+				//
+
+				Bundle bundle = queue.pollFirst(timeout, TimeUnit.MILLISECONDS);
+				if (bundle != null) {
+					trace("received bundle to test: %s", bundle.getLocation());
+					try (Writer report = getReportWriter(reportDir, bundleReportName(bundle))) {
+						trace("test will run");
+						result += test(bundle, testCases(bundle), report);
+						trace("test ran");
+					}
 				}
 				if (queue.isEmpty() && !continuous) {
 					trace("queue %s", queue);