From 0eb450f96d7abe98d952dde9b05abc72cb797636 Mon Sep 17 00:00:00 2001 From: Matthew Von-Maszewski Date: Wed, 24 Jul 2019 11:10:06 -0400 Subject: [PATCH] ENCRYPTION file sometimes not cleaned up then causes encrypted test to fail. Now cleaned up. (#9559) --- js/client/modules/@arangodb/testsuites/export.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/js/client/modules/@arangodb/testsuites/export.js b/js/client/modules/@arangodb/testsuites/export.js index 904b0ad2e4..143b95dc7c 100644 --- a/js/client/modules/@arangodb/testsuites/export.js +++ b/js/client/modules/@arangodb/testsuites/export.js @@ -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);