Skip to content

Commit

Permalink
Feature/sniff rta makedata (arangodb#19461)
Browse files Browse the repository at this point in the history
* forward

* add error log to the error message -> testfailures.txt

* sniff

* forward

* add missing cleanup as pointed out by @jsteemann

* forward
  • Loading branch information
dothebart authored Jul 25, 2023
1 parent 7a7d757 commit 1d2ef3d
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 4 deletions.
2 changes: 1 addition & 1 deletion 3rdParty/rta-makedata
Submodule rta-makedata updated 30 files
+18 −0 README.md
+28 −15 test_data/checkdata.js
+25 −14 test_data/cleardata.js
+158 −8 test_data/common.js
+18 −115 test_data/makedata.js
+4 −4 test_data/makedata_suites/000_dummy.js
+30 −40 test_data/makedata_suites/005_check_system_collection.js
+12 −8 test_data/makedata_suites/010_disabled_uuid_check.js
+15 −15 test_data/makedata_suites/020_foxx.js
+151 −0 test_data/makedata_suites/021_foxx_utf-8.js
+7 −7 test_data/makedata_suites/050_database.js
+4 −5 test_data/makedata_suites/051_database_extended_names.js
+66 −55 test_data/makedata_suites/100_collections.js
+723 −0 test_data/makedata_suites/101_collections.js
+1 −0 test_data/makedata_suites/101_collections_data.json
+258 −0 test_data/makedata_suites/102_collection_utf8.js
+17 −17 test_data/makedata_suites/400_views.js
+17 −17 test_data/makedata_suites/401_views.js
+66 −44 test_data/makedata_suites/402_views.js
+69 −0 test_data/makedata_suites/403_utf8-name-views.js
+4 −4 test_data/makedata_suites/404_views.js
+31 −27 test_data/makedata_suites/500_community_graph.js
+33 −24 test_data/makedata_suites/550_smart_graph.js
+34 −18 test_data/makedata_suites/570_enterprise_graph.js
+5 −5 test_data/makedata_suites/900_oneshard.js
+151 −0 test_data/makedata_suites/960_cursor.js
+81 −0 test_data/stress/smart_graph.js
+31 −0 test_data/stress/transaction_write_load.js
+7 −0 test_data/tests/js/common/test-data/apps/crud/routes/xxx.js
+15 −3 test_data/tests/js/server/replication/fuzz/replication-fuzz-global.js
10 changes: 8 additions & 2 deletions js/client/modules/@arangodb/testsuites/rta_makedata.js
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ function makeDataWrapper (options) {
return true;
}
runOneTest(file) {
let res = {'total':0, 'duration':0.0, 'status':true};
let res = {'total':0, 'duration':0.0, 'status':true, message: ''};
let tests = [
fs.join(this.options.rtasource, 'test_data', 'makedata.js'),
fs.join(this.options.rtasource, 'test_data', 'checkdata.js'),
Expand All @@ -109,6 +109,7 @@ function makeDataWrapper (options) {
count += 1;
let args = pu.makeArgs.arangosh(this.options);
args['server.endpoint'] = this.instanceManager.findEndpoint();
args['log.file'] = fs.join(fs.getTempPath(), `rta_out_${count}.log`);
args['javascript.execute'] = file;
if (this.options.forceJson) {
args['server.force-json'] = true;
Expand Down Expand Up @@ -158,10 +159,15 @@ function makeDataWrapper (options) {
print(argv);
}
let rc = pu.executeAndWait(pu.ARANGOSH_BIN, argv, this.options, 'arangosh', this.instanceManager.rootDir, this.options.coreCheck);
if (!rc.status) {
let rx = new RegExp(/\\n/g);
res.message += file + ':\n' + fs.read(args['log.file']).replace(rx, '\n');
} else {
fs.remove(args['log.file']);
}
res.total++;
res.duration += rc.duration;
res.status &= rc.status;

if ((this.options.cluster) && (count === 3)) {
print('relaunching dbserver');
stoppedDbServerInstance.restartOneInstance({});
Expand Down
2 changes: 1 addition & 1 deletion tests/test-definitions.txt
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ shell_client_transaction priority=500 cluster parallelity=5 size=small buckets=5
shell_client_replication2_recovery priority=500 size=small cluster -- --dumpAgencyOnError true
shell_server priority=500 size=medium+ cluster buckets=6 -- --dumpAgencyOnError true

rta_makedata cluster
rta_makedata sniff cluster

# Common Tests

Expand Down

0 comments on commit 1d2ef3d

Please sign in to comment.