Skip to content

Commit 8d90df7

Browse files
cpjuliacpjulia
committed
Merge branch 'devel' of github.com:arangodb/arangodb into feature/supervised-aql-value
2 parents 02da3f1 + ca8ba66 commit 8d90df7

File tree

9 files changed

+1288
-676
lines changed

9 files changed

+1288
-676
lines changed

‎CHANGELOG‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
devel
22
-----
33

4+
* FE-636: bump rollup from 2.79.1 to 2.79.2.
5+
46
* Replace arangodb.com with arango.ai in URLs
57

68
* Updated ArangoDB Starter to v0.19.15.

‎js/client/modules/@arangodb/testsuites/replication.js‎

Lines changed: 5 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -90,15 +90,6 @@ function shellReplication (options) {
9090
// //////////////////////////////////////////////////////////////////////////////
9191

9292
function shellClientReplicationApi (options) {
93-
if (options.skipServerJS) {
94-
return {
95-
shellClientReplicationApi: {
96-
status: true,
97-
message: 'server javascript not enabled. please recompile with -DUSE_V8=on'
98-
},
99-
status: true
100-
};
101-
}
10293
let testCases = tu.scanTestPaths(testPaths.http_replication, options);
10394

10495
var opts = {
@@ -171,15 +162,6 @@ class replicationRunner extends trs.runLocalInArangoshRunner {
171162
// //////////////////////////////////////////////////////////////////////////////
172163

173164
function replicationFuzz (options) {
174-
if (options.skipServerJS) {
175-
return {
176-
replicationFuzz: {
177-
status: true,
178-
message: 'server javascript not enabled. please recompile with -DUSE_V8=on'
179-
},
180-
status: true
181-
};
182-
}
183165
let testCases = tu.scanTestPaths(testPaths.replication_fuzz, options);
184166
return new replicationRunner(options, 'replication_fuzz', {"rocksdb.wal-file-timeout-initial": "7200"}).run(testCases);
185167
}
@@ -189,15 +171,6 @@ function replicationFuzz (options) {
189171
// //////////////////////////////////////////////////////////////////////////////
190172

191173
function replicationRandom (options) {
192-
if (options.skipServerJS) {
193-
return {
194-
replicationRandom: {
195-
status: true,
196-
message: 'server javascript not enabled. please recompile with -DUSE_V8=on'
197-
},
198-
status: true
199-
};
200-
}
201174
let testCases = tu.scanTestPaths(testPaths.replication_random, options);
202175
return new replicationRunner(options, 'replication_random').run(testCases);
203176
}
@@ -217,15 +190,6 @@ function replicationAql (options) {
217190

218191
var _replicationOngoing = function(path) {
219192
this.func = function replicationOngoing (options) {
220-
if (options.skipServerJS) {
221-
return {
222-
shell_replication_ongoing: {
223-
status: true,
224-
message: 'server javascript not enabled. please recompile with -DUSE_V8=on'
225-
},
226-
status: true
227-
};
228-
}
229193
let testCases = tu.scanTestPaths(testPaths[path], options);
230194
return new replicationRunner(options, path).run(testCases);
231195
};
@@ -241,40 +205,24 @@ const replicationOngoingFrompresent = (new _replicationOngoing('replication_ongo
241205
// //////////////////////////////////////////////////////////////////////////////
242206

243207
function replicationStatic (options) {
244-
if (options.skipServerJS) {
245-
return {
246-
replicationStatic: {
247-
status: true,
248-
message: 'server javascript not enabled. please recompile with -DUSE_V8=on'
249-
},
250-
status: true
251-
};
252-
}
253208
let testCases = tu.scanTestPaths(testPaths.replication_static, options);
254209
testCases = tu.splitBuckets(options, testCases);
255-
256-
return new replicationRunner(
257-
options,
210+
let localOptions = Object.assign({extraArgs: {'vector-index': true}}, options, tu.testServerAuthInfo);
211+
let ret = new replicationRunner(
212+
localOptions,
258213
'leader_static',
259214
{
260215
'server.authentication': 'true'
261216
}, true).run(testCases);
217+
options.cleanup = options.cleanup && localOptions.cleanup;
218+
return ret;
262219
}
263220

264221
// //////////////////////////////////////////////////////////////////////////////
265222
// / @brief TEST: replication_sync
266223
// //////////////////////////////////////////////////////////////////////////////
267224

268225
function replicationSync (options) {
269-
if (options.skipServerJS) {
270-
return {
271-
replicationSync: {
272-
status: true,
273-
message: 'server javascript not enabled. please recompile with -DUSE_V8=on'
274-
},
275-
status: true
276-
};
277-
}
278226
let testCases = tu.scanTestPaths(testPaths.replication_sync, options);
279227
testCases = tu.splitBuckets(options, testCases);
280228

‎tests/Fuerte/ConnectionFailuresTest.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,8 @@ static void tryToConnectExpectFailure(f::EventLoopService& eventLoopService,
126126
// that cannot be resolved.
127127
TEST(ConnectionFailureTest, CannotResolveHttp) {
128128
f::EventLoopService loop;
129-
tryToConnectExpectFailure(
130-
loop, "http://thishostmustnotexist.arango.ai:8529", false);
129+
tryToConnectExpectFailure(loop, "http://thishostmustnotexist.arango.ai:8529",
130+
false);
131131
}
132132

133133
// CannotConnect tests try to make a connection to a host with a valid name

0 commit comments

Comments
 (0)