Elgato_dark/zeppelin
1
0
Fork 0
mirror of https://github.com/apache/zeppelin synced 2026-05-24 09:38:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

add job run and stop testcase.

Browse source
This commit is contained in:
root 2015-11-25 00:31:21 +09:00
parent 6103c426f2
commit 2bff6c9398
3 changed files with 132 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
zeppelin-server/src/main/java/org/apache/zeppelin/rest/NotebookRestApi.java
View file

@ -33,7 +33,6 @@ import org.apache.zeppelin.notebook.Paragraph;
import org.apache.zeppelin.rest.message.InterpreterSettingListForNoteBind;
import org.apache.zeppelin.rest.message.NewInterpreterSettingRequest;
import org.apache.zeppelin.rest.message.NewNotebookRequest;
import org.apache.zeppelin.rest.message.RunNotebookRequest;
import org.apache.zeppelin.server.JsonResponse;
import org.apache.zeppelin.server.ZeppelinServer;
import org.apache.zeppelin.socket.NotebookServer;

2
zeppelin-server/src/test/java/org/apache/zeppelin/rest/AbstractTestRestApi.java
View file

@ -393,6 +393,8 @@ public abstract class AbstractTestRestApi {
protected Matcher<? super HttpMethodBase> isCreated() { return responsesWith(201); }
protected Matcher<? super HttpMethodBase> isAccepted() { return responsesWith(202); }
protected Matcher<? super HttpMethodBase> isNotAllowed() {
return responsesWith(405);
}

131
zeppelin-server/src/test/java/org/apache/zeppelin/rest/ZeppelinRestApiTest.java
View file

@ -259,7 +259,7 @@ public class ZeppelinRestApiTest extends AbstractTestRestApi {
LOG.info("testCloneNotebook");
// Create note to clone
Note note = ZeppelinServer.notebook.createNote();
assertNotNull("cant create new note", note);
assertNotNull("can't create new note", note);
note.setName("source note for clone");
Paragraph paragraph = note.addParagraph();
paragraph.setText("%md This is my new paragraph in my new note");
@ -300,5 +300,134 @@ public class ZeppelinRestApiTest extends AbstractTestRestApi {
get.releaseConnection();
}
@Test
public void testRunNoteJobs() throws IOException, InterruptedException {
LOG.info("testRunNoteJobs");
// Create note to run test.
Note note = ZeppelinServer.notebook.createNote();
assertNotNull("can't create new note", note);
note.setName("note for run test");
Paragraph paragraph = note.addParagraph();
paragraph.setText("%md This is test paragraph.");
note.persist();
String noteID = note.getId();
// Call Run Notebook Jobs REST API
PostMethod post = httpPost("/notebook/job/" + noteID, "");
assertThat("test notebook jobs run:", post, isAccepted());
// wait until job is finished or timeout.
int timeout = 1;
while(paragraph.getStatus() == Status.PENDING) {
Thread.sleep(1000);
if (timeout++ > 10) {
LOG.info("testRunNoteJobs timeout job.");
break;
}
}
assertEquals("testRunNoteJobs has finished", true, paragraph.isTerminated());
//cleanup
ZeppelinServer.notebook.removeNote(note.getId());
post.releaseConnection();
}
@Test
public void testStopNoteJobs() throws IOException, InterruptedException {
LOG.info("testStopNoteJobs");
// Create note to stop test.
Note note = ZeppelinServer.notebook.createNote();
assertNotNull("can't create new note", note);
note.setName("note for stop test");
Paragraph paragraph = note.addParagraph();
paragraph.setText("%md This is test paragraph.");
note.persist();
String noteID = note.getId();
note.runAll();
// Call Stop Notebook Jobs REST API
DeleteMethod delete = httpDelete("/notebook/job/" + noteID);
assertThat("test notebook stop:", delete, isAccepted());
// wait until job is finished or timeout.
int timeout = 1;
while(paragraph.getStatus() == Status.PENDING) {
Thread.sleep(1000);
if (timeout++ > 10) {
LOG.info("testStopNoteJobs timeout job.");
break;
}
}
assertEquals("testStopNoteJobs has finished", paragraph.getStatus(), Status.ABORT);
//cleanup
ZeppelinServer.notebook.removeNote(note.getId());
delete.releaseConnection();
}
@Test
public void testRunParagraph() throws IOException, InterruptedException {
LOG.info("testRunParagraph");
// Create note to run test.
Note note = ZeppelinServer.notebook.createNote();
assertNotNull("can't create new note", note);
note.setName("note for run test");
Paragraph paragraph = note.addParagraph();
paragraph.setText("%md This is test paragraph.");
note.persist();
String noteID = note.getId();
// Call Run Notebook REST API
PostMethod post = httpPost("/notebook/job/" + noteID + "/" + paragraph.getId(), "");
assertThat("test paragraph run:", post, isAccepted());
// wait until job is finished or timeout.
int timeout = 1;
while(paragraph.getStatus() == Status.PENDING) {
Thread.sleep(1000);
if (timeout++ > 10) {
LOG.info("testRunParagraph timeout job.");
break;
}
}
assertEquals("testRunParagraph finish", true, paragraph.isTerminated());
//cleanup
ZeppelinServer.notebook.removeNote(note.getId());
post.releaseConnection();
}
@Test
public void testStopParagraph() throws IOException, InterruptedException {
LOG.info("testStopParagraph");
// Create note to stop test.
Note note = ZeppelinServer.notebook.createNote();
assertNotNull("can't create new note", note);
note.setName("note for stop test");
Paragraph paragraph = note.addParagraph();
paragraph.setText("%md This is test paragraph.");
note.persist();
String noteID = note.getId();
note.run(paragraph.getId());
// Call stop Notebook REST API
DeleteMethod delete = httpDelete("/notebook/job/" + noteID + "/" + paragraph.getId());
assertThat("test paragraph stop:", delete, isAccepted());
// wait until job is finished or timeout.
int timeout = 1;
while(paragraph.getStatus() == Status.PENDING) {
Thread.sleep(1000);
if (timeout++ > 10) {
LOG.info("testStopParagraph timeout job.");
break;
}
}
assertEquals("testStopParagraph finish", paragraph.getStatus(), Status.ABORT);
//cleanup
ZeppelinServer.notebook.removeNote(note.getId());
delete.releaseConnection();
}
}