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

Handle the case of user already have a shiro ini :: backup current ini and perform tests then restaure

Browse source
This commit is contained in:
Anthony Corbacho 2016-11-05 09:57:20 +09:00
parent 608e718a44
commit c163bd89c9
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
zeppelin-server/src/test/java/org/apache/zeppelin/integration/AuthenticationIT.java
View file

@ -84,7 +84,9 @@ public class AuthenticationIT extends AbstractZeppelinIT {
ZeppelinConfiguration conf = ZeppelinConfiguration.create();
shiroPath = conf.getRelativeDir(String.format("%s/shiro.ini", conf.getConfDir()));
File file = new File(shiroPath);
originalShiro = StringUtils.join(FileUtils.readLines(file, "UTF-8"), "\n");
if (file.exists()) {
originalShiro = StringUtils.join(FileUtils.readLines(file, "UTF-8"), "\n");
}
FileUtils.write(file, authShiro, "UTF-8");
} catch (IOException e) {
LOG.error("Error in AuthenticationIT startUp::", e);
@ -99,9 +101,17 @@ public class AuthenticationIT extends AbstractZeppelinIT {
if (!endToEndTestEnabled()) {
return;
}
if (!StringUtils.isBlank(shiroPath)) {
File file = new File(shiroPath);
FileUtils.deleteQuietly(file);
try {
if (!StringUtils.isBlank(shiroPath)) {
File file = new File(shiroPath);
if (StringUtils.isBlank(originalShiro)) {
FileUtils.deleteQuietly(file);
} else {
FileUtils.write(file, originalShiro, "UTF-8");
}
}
} catch (IOException e) {
LOG.error("Error in AuthenticationIT tearDown::", e);
}
ZeppelinITUtils.restartZeppelin();
driver.quit();