You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by bz...@apache.org on 2015/12/18 15:55:28 UTC
incubator-zeppelin git commit: Zeppelin-516: Hotfix for test failure
on master
Repository: incubator-zeppelin
Updated Branches:
refs/heads/master f91b6962b -> 0292f30a8
Zeppelin-516: Hotfix for test failure on master
### What is this PR for?
This PR should fix master test failure, more explanation in Jira issue.
### What type of PR is it?
Hot Fix
### Todos
* [x] - fix proper directory removal without throwing error
### Is there a relevant Jira issue?
https://issues.apache.org/jira/browse/ZEPPELIN-516
### How should this be tested?
CI should pass
### Screenshots (if appropriate)
### Questions:
* Does the licenses files need update? No
* Is there breaking changes for older versions? No
* Does this needs documentation? No
Author: Khalid Huseynov <kh...@nflabs.com>
Closes #552 from khalidhuseynov/hotfix-zeppelin-516 and squashes the following commits:
3fc204f [Khalid Huseynov] remove dir quietly
Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/0292f30a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/0292f30a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/0292f30a
Branch: refs/heads/master
Commit: 0292f30a870b0547df8ba2737a0112b3e2ae3d90
Parents: f91b696
Author: Khalid Huseynov <kh...@nflabs.com>
Authored: Fri Dec 18 18:31:51 2015 +0900
Committer: Alexander Bezzubov <bz...@apache.org>
Committed: Fri Dec 18 23:55:11 2015 +0900
----------------------------------------------------------------------
.../org/apache/zeppelin/notebook/repo/VFSNotebookRepoTest.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/0292f30a/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/repo/VFSNotebookRepoTest.java
----------------------------------------------------------------------
diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/repo/VFSNotebookRepoTest.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/repo/VFSNotebookRepoTest.java
index 8b6917b..c3bb3a0 100644
--- a/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/repo/VFSNotebookRepoTest.java
+++ b/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/repo/VFSNotebookRepoTest.java
@@ -85,7 +85,10 @@ public class VFSNotebookRepoTest implements JobListenerFactory{
@After
public void tearDown() throws Exception {
- FileUtils.deleteDirectory(mainZepDir);
+ //FileUtils.deleteDirectory(mainZepDir);
+ if (!FileUtils.deleteQuietly(mainZepDir)) {
+ logger.error("Failed to delete {} ", mainZepDir.getName());
+ }
}
@Test