mirror of
https://github.com/apache/zeppelin
synced 2026-05-24 09:38:26 +00:00
merge seperated job testcase.
This commit is contained in:
parent
2bff6c9398
commit
722f05b944
1 changed files with 20 additions and 105 deletions
|
|
@ -301,8 +301,8 @@ public class ZeppelinRestApiTest extends AbstractTestRestApi {
|
|||
}
|
||||
|
||||
@Test
|
||||
public void testRunNoteJobs() throws IOException, InterruptedException {
|
||||
LOG.info("testRunNoteJobs");
|
||||
public void testNoteJobs() throws IOException, InterruptedException {
|
||||
LOG.info("testNoteJobs");
|
||||
// Create note to run test.
|
||||
Note note = ZeppelinServer.notebook.createNote();
|
||||
assertNotNull("can't create new note", note);
|
||||
|
|
@ -313,121 +313,36 @@ public class ZeppelinRestApiTest extends AbstractTestRestApi {
|
|||
String noteID = note.getId();
|
||||
|
||||
// Call Run Notebook Jobs REST API
|
||||
PostMethod post = httpPost("/notebook/job/" + noteID, "");
|
||||
assertThat("test notebook jobs run:", post, isAccepted());
|
||||
PostMethod postNoteJobs = httpPost("/notebook/job/" + noteID, "");
|
||||
assertThat("test notebook jobs run:", postNoteJobs, isAccepted());
|
||||
postNoteJobs.releaseConnection();
|
||||
|
||||
// wait until job is finished or timeout.
|
||||
int timeout = 1;
|
||||
while(paragraph.getStatus() == Status.PENDING) {
|
||||
while (paragraph.getStatus() == Status.PENDING || paragraph.isTerminated()) {
|
||||
Thread.sleep(1000);
|
||||
if (timeout++ > 10) {
|
||||
LOG.info("testRunNoteJobs timeout job.");
|
||||
LOG.info("testNoteJobs 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;
|
||||
}
|
||||
}
|
||||
DeleteMethod deleteNoteJobs = httpDelete("/notebook/job/" + noteID);
|
||||
assertThat("test notebook stop:", deleteNoteJobs, isAccepted());
|
||||
deleteNoteJobs.releaseConnection();
|
||||
|
||||
// Call Run paragraph REST API
|
||||
PostMethod postParagraph = httpPost("/notebook/job/" + noteID + "/" + paragraph.getId(), "");
|
||||
assertThat("test paragraph run:", postParagraph, isAccepted());
|
||||
postParagraph.releaseConnection();
|
||||
|
||||
// Call Stop paragraph REST API
|
||||
DeleteMethod deleteParagraph = httpDelete("/notebook/job/" + noteID + "/" + paragraph.getId());
|
||||
assertThat("test paragraph stop:", deleteParagraph, isAccepted());
|
||||
deleteParagraph.releaseConnection();
|
||||
|
||||
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();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue