From d81217999dafb920998731532cfa8a140c2ed9c1 Mon Sep 17 00:00:00 2001 From: jonmv Date: Wed, 3 Aug 2022 17:58:28 +0200 Subject: Revert "Merge pull request #23571 from vespa-engine/jonmv/set-tccl-for-junit" This reverts commit f225034b029702db20a25a15824570826b5ac4c2, reversing changes made to a0d3401bf99415ef9d115e51b988f5f3ade0dd57. --- .../com/yahoo/vespa/testrunner/JunitRunner.java | 42 +++++++++------------- 1 file changed, 16 insertions(+), 26 deletions(-) diff --git a/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/JunitRunner.java b/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/JunitRunner.java index 8575d22c384..54f0941208d 100644 --- a/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/JunitRunner.java +++ b/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/JunitRunner.java @@ -104,32 +104,22 @@ public class JunitRunner extends AbstractComponent implements TestRunner { private TestReport launchJunit(Suite suite, byte[] testConfig) { List> testClasses = classLoader.apply(suite); if (testClasses == null) - return null; - - ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader(); - try { - testRuntimeProvider.initialize(testConfig); - TestReportGeneratingListener testReportListener = new TestReportGeneratingListener(suite, - record -> logRecords.put(record.getSequenceNumber(), record), - stdoutTee, - stderrTee, - clock); - - if ( ! testClasses.isEmpty()) - Thread.currentThread().setContextClassLoader(testClasses.get(0).getClassLoader()); - - LauncherDiscoveryRequest discoveryRequest = LauncherDiscoveryRequestBuilder.request() - .selectors(testClasses.stream() - .map(DiscoverySelectors::selectClass) - .collect(toList())) - .build(); - testExecutor.accept(discoveryRequest, new TestExecutionListener[] { testReportListener }); - - return testReportListener.report(); - } - finally { - Thread.currentThread().setContextClassLoader(contextClassLoader); - } + return null; + + testRuntimeProvider.initialize(testConfig); + TestReportGeneratingListener testReportListener = new TestReportGeneratingListener(suite, + record -> logRecords.put(record.getSequenceNumber(), record), + stdoutTee, + stderrTee, + clock); + LauncherDiscoveryRequest discoveryRequest = LauncherDiscoveryRequestBuilder.request() + .selectors(testClasses.stream() + .map(DiscoverySelectors::selectClass) + .collect(toList())) + .build(); + testExecutor.accept(discoveryRequest, new TestExecutionListener[] { testReportListener }); + + return testReportListener.report(); } @Override -- cgit v1.2.3