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

fix broken dump_encrypted test

This commit is contained in:
jsteemann 2018-04-13 14:22:12 +02:00
parent d43f4a1b1b
commit 35a96f1113
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
js/server/tests/dump/dump-mmfiles-cluster.js
View File

@ -376,6 +376,8 @@ function dumpTestEnterpriseSuite () {
}, },
testShadowCollectionsOmitted : function () { testShadowCollectionsOmitted : function () {
const encryption = fs.read(fs.join(instanceInfo.rootDir, 'dump', 'ENCRYPTION'));
if (encryption === '' || encryption === 'none') {
const dumpDir = fs.join(instanceInfo.rootDir, 'dump'); const dumpDir = fs.join(instanceInfo.rootDir, 'dump');
const collStructure = JSON.parse( const collStructure = JSON.parse(
fs.read(fs.join(dumpDir, `${edges}.structure.json`)) fs.read(fs.join(dumpDir, `${edges}.structure.json`))
@ -385,6 +387,7 @@ function dumpTestEnterpriseSuite () {
const parameters = collStructure['parameters']; const parameters = collStructure['parameters'];
assertFalse(parameters.hasOwnProperty('shadowCollections'), assertFalse(parameters.hasOwnProperty('shadowCollections'),
`Property 'shadowCollections' should be hidden in collection ${edges}!`); `Property 'shadowCollections' should be hidden in collection ${edges}!`);
}
}, },
testVertices : function () { testVertices : function () {