Skip to content

ZEPPELIN-1063: fix PythonInterpreter flaky test #1134

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
bzz wants to merge 3 commits into from
Closed

ZEPPELIN-1063: fix PythonInterpreter flaky test #1134

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3529fe5
fix PythonInterpreterTest.testClose() test
bzz Jul 5, 2016
1be7732
Adding timeout for py4j gateway to have time to shutdown
bzz Jul 5, 2016
65698d2
Reduce :sleeping: time in python interpreter unit-test
bzz Jul 7, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 14 additions & 9 deletions python/src/test/java/org/apache/zeppelin/python/PythonInterpreterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import java.net.Socket;
import java.net.SocketAddress;
import java.util.Properties;
import java.util.concurrent.TimeUnit;

import org.apache.zeppelin.interpreter.InterpreterResult;
import org.junit.Before;
Expand Down Expand Up @@ -110,13 +111,10 @@ public void testPy4jIsNotInstalled() {

/**
* If Py4J installed, bootstrap_input.py
* is sent to interpreter and JavaGateway is
* running
*
* @throws IOException
* is sent to interpreter and JavaGateway is running
*/
@Test
public void testPy4jInstalled() throws IOException {
public void testPy4jInstalled() throws IOException, InterruptedException {
when(mockPythonProcess.sendAndGetResult(eq("\n\nimport py4j\n"))).thenReturn(">>>");

pythonInterpreter.open();
Expand All @@ -131,6 +129,9 @@ public void testPy4jInstalled() throws IOException {
assertTrue(cmdHistory.contains("org.apache.zeppelin.display.Input"));

assertTrue(serverIsListeningOn(py4jPort));
pythonInterpreter.close();
TimeUnit.MILLISECONDS.sleep(100);
assertFalse(serverIsListeningOn(py4jPort));
}

@Test
Expand All @@ -144,6 +145,7 @@ public void testClose() throws IOException, InterruptedException {

//when
pythonInterpreter.close();
TimeUnit.MILLISECONDS.sleep(100);

//then
assertFalse(serverIsListeningOn(py4jPort));
Expand All @@ -164,13 +166,16 @@ public void testInterpret() {
* @param port
*/
private boolean serverIsListeningOn(Integer port) {
boolean serverIsListening = false;
Socket s = new Socket();
boolean serverIsListening = false;

boolean connected = tryToConnect(s, port);
if (connected) {
serverIsListening = true;
int retryCount = 0;
boolean connected = false;
while (connected = tryToConnect(s, port) && retryCount < 10) {
serverIsListening = connected;
tryToClose(s);
retryCount++;
s = new Socket();
Copy link
Member

@felixcheung felixcheung Jul 6, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

put a sleep(1) before retry?

Copy link
Member Author

@bzz bzz Jul 7, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sleep added inside the client code in tests, where we know that it's needed to wait for something to startup\shutdown

}
return serverIsListening;
}
Expand Down