[Java] Fix some potential bugs about Ray.shutdown() (#5693)

This commit is contained in:
Kai Yang
2019-09-24 10:44:17 +08:00
committed by Hao Chen
parent a4659a8f8b
commit c580955840
5 changed files with 18 additions and 3 deletions
@@ -45,13 +45,17 @@ public abstract class BaseMultiLanguageTest {
}
}
@BeforeClass(alwaysRun = true)
public void setUp() {
private void checkMultiLanguageTestFlag() {
if (!"1".equals(System.getenv("ENABLE_MULTI_LANGUAGE_TESTS"))) {
LOGGER.info("Skip Multi-language tests because environment variable "
+ "ENABLE_MULTI_LANGUAGE_TESTS isn't set");
throw new SkipException("Skip test.");
}
}
@BeforeClass(alwaysRun = true)
public void setUp() {
checkMultiLanguageTestFlag();
// Delete existing socket files.
for (String socket : ImmutableList.of(RAYLET_SOCKET_NAME, PLASMA_STORE_SOCKET_NAME)) {
@@ -102,6 +106,8 @@ public abstract class BaseMultiLanguageTest {
@AfterClass(alwaysRun = true)
public void tearDown() {
checkMultiLanguageTestFlag();
// Disconnect to the cluster.
Ray.shutdown();
System.clearProperty("ray.redis.address");
@@ -14,7 +14,7 @@ public class BaseTest {
private static final Logger LOGGER = LoggerFactory.getLogger(BaseTest.class);
private List<File> filesToDelete;
private List<File> filesToDelete = ImmutableList.of();
@BeforeMethod(alwaysRun = true)
public void setUpBase(Method method) {