Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ENCRYPTION file sometimes not cleaned up then causes encrypted test to fail. Now cleaned up. (#9559)

This commit is contained in:
Matthew Von-Maszewski 2019-07-24 11:10:06 -04:00 committed by GitHub
parent 4f4453d50f
commit 0eb450f96d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/client/modules/@arangodb/testsuites/export.js
View File

@ -173,6 +173,9 @@ function exportTest (options) {
if (!skipEncrypt) {
print(CYAN + Date() + ': Export data (json encrypt)' + RESET);
args['encryption.keyfile'] = keyfile;
if (fs.exists(fs.join(tmpPath, 'ENCRYPTION'))) {
fs.remove(fs.join(tmpPath, 'ENCRYPTION'));
}
results.exportJsonEncrypt = pu.executeAndWait(pu.ARANGOEXPORT_BIN, toArgv(args), options, 'arangosh', tmpPath, false, options.coreCheck);
results.exportJsonEncrypt.failed = results.exportJsonGz.status ? 0 : 1;
@ -192,6 +195,9 @@ function exportTest (options) {
};
}
delete args['encryption.keyfile'];
if (fs.exists(fs.join(tmpPath, 'ENCRYPTION'))) {
fs.remove(fs.join(tmpPath, 'ENCRYPTION'));
}
}
print(CYAN + Date() + ': Export data (jsonl)' + RESET);