From b07bca766648c62318f9ebada50ba00a606b5fb4 Mon Sep 17 00:00:00 2001 From: Prabhjyot Singh Date: Fri, 15 Jan 2016 14:59:49 +0530 Subject: [PATCH 1/2] instead of 2 create 1 directory --- .../test/java/org/apache/zeppelin/notebook/NotebookTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NotebookTest.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NotebookTest.java index 34f7a1bb108..e98e6809364 100644 --- a/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NotebookTest.java +++ b/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NotebookTest.java @@ -71,7 +71,7 @@ public void setUp() throws Exception { tmpDir = new File(System.getProperty("java.io.tmpdir")+"/ZeppelinLTest_"+System.currentTimeMillis()); tmpDir.mkdirs(); new File(tmpDir, "conf").mkdirs(); - notebookDir = new File(System.getProperty("java.io.tmpdir")+"/ZeppelinLTest_"+System.currentTimeMillis()+"/notebook"); + notebookDir = new File(tmpDir + "/notebook"); notebookDir.mkdirs(); System.setProperty(ConfVars.ZEPPELIN_HOME.getVarName(), tmpDir.getAbsolutePath()); From ddda3c50a209157947690decca86794dad35b8a9 Mon Sep 17 00:00:00 2001 From: Prabhjyot Singh Date: Fri, 15 Jan 2016 15:00:02 +0530 Subject: [PATCH 2/2] registeredInterpreters.clear() in tearDown --- .../org/apache/zeppelin/notebook/NoteInterpreterLoaderTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NoteInterpreterLoaderTest.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NoteInterpreterLoaderTest.java index a0455eb7ccd..9496e4dc4d5 100644 --- a/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NoteInterpreterLoaderTest.java +++ b/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NoteInterpreterLoaderTest.java @@ -64,6 +64,7 @@ public void setUp() throws Exception { @After public void tearDown() throws Exception { delete(tmpDir); + Interpreter.registeredInterpreters.clear(); } @Test