Skip to content

Commit 1a75040

Browse files
dothebartKVS85
andauthored
we no longer need to differentiate for community (#22148)
* we no longer need to differentiate for community * also look for arangobackup * fallback completely unnecssary. * also have a flag for single server runs --------- Co-authored-by: Vadim Kondratev <[email protected]>
1 parent 99ff1fa commit 1a75040

File tree

3 files changed

+2
-12
lines changed

3 files changed

+2
-12
lines changed

js/client/modules/@arangodb/testutils/instance-manager.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1624,8 +1624,5 @@ exports.registerOptions = function(optionsDefaults, optionsDocumentation, option
16241624
process.env['MALLOC_CONF'] = 'prof:true';
16251625
}
16261626
options.noStartStopLogs = !options.extremeVerbosity && options.noStartStopLogs;
1627-
if (options.encryptionAtRest && !pu.isEnterpriseClient) {
1628-
options.encryptionAtRest = false;
1629-
}
16301627
});
16311628
};

js/client/modules/@arangodb/testutils/process-utils.js

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ const download = internal.download;
5050
const time = internal.time;
5151
const wait = internal.wait;
5252
const sleep = internal.sleep;
53-
const isEnterprise = require("@arangodb/test-helper").isEnterprise;
5453

5554
/* Constants: */
5655
// const BLUE = internal.COLORS.COLOR_BLUE;
@@ -73,7 +72,6 @@ let executableExt = '';
7372
let serverCrashedLocal = false;
7473
let serverFailMessagesLocal = "";
7574
let cleanupDirectories = [];
76-
let isEnterpriseClient = false;
7775

7876
let BIN_DIR;
7977
let ARANGOBACKUP_BIN;
@@ -168,15 +166,11 @@ function setupBinaries (options) {
168166
ARANGOD_BIN,
169167
ARANGOIMPORT_BIN,
170168
ARANGORESTORE_BIN,
169+
ARANGOBACKUP_BIN,
171170
ARANGOEXPORT_BIN,
172171
ARANGOSH_BIN
173172
];
174173

175-
if (isEnterprise()) {
176-
isEnterpriseClient = true;
177-
checkFiles.push(ARANGOBACKUP_BIN);
178-
}
179-
180174
checkFiles.forEach((file) => {
181175
if (!fs.isFile(file)) {
182176
throw new Error('unable to locate ' + file);
@@ -469,7 +463,6 @@ exports.endpointToURL = endpointToURL;
469463

470464
exports.executeAndWait = executeAndWait;
471465
exports.killRemainingProcesses = killRemainingProcesses;
472-
exports.isEnterpriseClient = isEnterpriseClient;
473466

474467
exports.executableExt = executableExt;
475468

js/client/modules/@arangodb/testutils/result-processing.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ function saveToJunitXML(options, results) {
274274
testRunName: '',
275275
seenTestCases: false,
276276
};
277-
let prefix = (options.cluster ? 'CL_' : '') + (pu.isEnterpriseClient ? 'EE_' : 'CE_');
277+
let prefix = (options.cluster ? 'CL_' : 'SG_');
278278

279279
const addOptionalDuration = (elem, test) => {
280280
if (test.hasOwnProperty('duration') && test.duration !== undefined) {

0 commit comments

Comments
 (0)