diff options
| author | Håkon Hallingstad <hakon.hallingstad@gmail.com> | 2022-08-03 18:11:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-03 18:11:47 +0200 |
| commit | fd8261f30845e87b6cc9cb4d09d16e5d2a4f7694 (patch) | |
| tree | fbedd2fbf70fe02d35d1f4f990b8f7a1a3240761 | |
| parent | cc0e0a6919a4fccd7ef6d6016ba186136d49c956 (diff) | |
| parent | d81217999dafb920998731532cfa8a140c2ed9c1 (diff) | |
Merge pull request #23575 from vespa-engine/jonmv/no-tccl-setting
Revert "Merge pull request #23571 from vespa-engine/jonmv/set-tccl-fo…
| -rw-r--r-- | vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/JunitRunner.java | 42 |
1 files 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<Class<?>> 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 |