This is an automated email from the ASF dual-hosted git repository. pdallig pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/zeppelin.git
The following commit(s) were added to refs/heads/master by this push: new a1b7368 [ZEPPELIN-5421] Cleanup surefire PR a1b7368 is described below commit a1b73684171a0d27221d87ac0e09c2fb465a0213 Author: PDallig <p.dal...@avm.de> AuthorDate: Fri Mar 18 15:03:04 2022 +0100 [ZEPPELIN-5421] Cleanup surefire PR ### What is this PR for? This pull request fixes some of code smells of the last PR. ### What type of PR is it? - Code Smells ### What is the Jira issue? * https://issues.apache.org/jira/browse/ZEPPELIN-5421 ### How should this be tested? * CI ### Questions: * Does the licenses files need update? No * Is there breaking changes for older versions? No * Does this needs documentation? No Author: PDallig <p.dal...@avm.de> Closes #4324 from Reamer/cleanup_surefire and squashes the following commits: 97d9177f1 [PDallig] Cleanup surefire PR --- .../src/main/java/org/apache/zeppelin/socket/SessionConfigurator.java | 2 +- .../src/test/java/org/apache/zeppelin/recovery/RecoveryTest.java | 2 +- .../src/test/java/org/apache/zeppelin/rest/AbstractTestRestApi.java | 3 --- .../src/test/java/org/apache/zeppelin/rest/NotebookRestApiTest.java | 1 - 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/socket/SessionConfigurator.java b/zeppelin-server/src/main/java/org/apache/zeppelin/socket/SessionConfigurator.java index b6bd59e..dc4a933 100644 --- a/zeppelin-server/src/main/java/org/apache/zeppelin/socket/SessionConfigurator.java +++ b/zeppelin-server/src/main/java/org/apache/zeppelin/socket/SessionConfigurator.java @@ -45,6 +45,6 @@ public class SessionConfigurator extends ServerEndpointConfig.Configurator { @Override public <T> T getEndpointInstance(Class<T> endpointClass) throws InstantiationException { - return ServiceLocatorFactory.getInstance().find("shared-locator").getService(endpointClass); + return ServiceLocatorFactory.getInstance().find(ZeppelinServer.SERVICE_LOCATOR_NAME).getService(endpointClass); } } diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/recovery/RecoveryTest.java b/zeppelin-server/src/test/java/org/apache/zeppelin/recovery/RecoveryTest.java index ec7968f..3f51395 100644 --- a/zeppelin-server/src/test/java/org/apache/zeppelin/recovery/RecoveryTest.java +++ b/zeppelin-server/src/test/java/org/apache/zeppelin/recovery/RecoveryTest.java @@ -67,7 +67,7 @@ public class RecoveryTest extends AbstractTestRestApi { recoveryDir.getAbsolutePath()); startUp(RecoveryTest.class.getSimpleName()); - notebook = ServiceLocatorFactory.getInstance().find("shared-locator").getService(Notebook.class); + notebook = ServiceLocatorFactory.getInstance().find(ZeppelinServer.SERVICE_LOCATOR_NAME).getService(Notebook.class); } @After diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/rest/AbstractTestRestApi.java b/zeppelin-server/src/test/java/org/apache/zeppelin/rest/AbstractTestRestApi.java index 46d1bb2..210d2fd 100644 --- a/zeppelin-server/src/test/java/org/apache/zeppelin/rest/AbstractTestRestApi.java +++ b/zeppelin-server/src/test/java/org/apache/zeppelin/rest/AbstractTestRestApi.java @@ -326,11 +326,8 @@ public abstract class AbstractTestRestApi { FileUtils.deleteQuietly(shiroIni); } LOG.info("Terminating Zeppelin Server..."); - //ZeppelinServer.jettyWebServer.stop(); executor.shutdown(); executor.shutdownNow(); - //PluginManager.reset(); - //ZeppelinConfiguration.reset(); long s = System.currentTimeMillis(); boolean started = true; diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/rest/NotebookRestApiTest.java b/zeppelin-server/src/test/java/org/apache/zeppelin/rest/NotebookRestApiTest.java index d8ebd75..4744832 100644 --- a/zeppelin-server/src/test/java/org/apache/zeppelin/rest/NotebookRestApiTest.java +++ b/zeppelin-server/src/test/java/org/apache/zeppelin/rest/NotebookRestApiTest.java @@ -1123,7 +1123,6 @@ public class NotebookRestApiTest extends AbstractTestRestApi { new TypeToken<Map<String, Object>>() {}.getType()); assertEquals("OK", resp.get("status")); post2.close(); - Thread.sleep(60000); TestUtils.getInstance(Notebook.class).processNote(note1Id, note1 -> { Paragraph p1 = note1.getParagraph(0);