try to exit nonzero if we have errors (#54)

dothebart · web-flow · commit d42b66d5d3c5 · 2023-10-24T13:15:52.000+02:00
* try to exit nonzero if we have errors

* print server version

* return status
diff --git a/simple/run-big-all-runs1.js b/simple/run-big-all-runs1.js
@@ -1,5 +1,5 @@
 function main () {
-  require("./simple/test").test({
+  return require("./simple/test").test({
     outputCsv: true,
     big: true,
     runs: 1,
@@ -16,5 +16,5 @@ function main () {
   });
 }
 if (typeof arango !== "undefined") {
-  main();
+  return main();
 }
diff --git a/simple/run-big-all.js b/simple/run-big-all.js
@@ -1,5 +1,5 @@
 function main () {
-  require("./simple/test").test({
+  return require("./simple/test").test({
     outputCsv: true,
     big: true,
 
@@ -15,5 +15,5 @@ function main () {
   });
 }
 if (typeof arango !== "undefined") {
-  main();
+  return main();
 }
diff --git a/simple/run-big-crud.js b/simple/run-big-crud.js
@@ -1,10 +1,10 @@
 function main () {
-  require("./simple/test").test({
+  return require("./simple/test").test({
     outputCsv: true,
     big: true,
     crud: true
   });
 }
 if (typeof arango !== "undefined") {
-  main();
+  return main();
 }
diff --git a/simple/run-medium-all-runs1.js b/simple/run-medium-all-runs1.js
@@ -1,5 +1,5 @@
 function main () {
-  require("./simple/test").test({
+  return require("./simple/test").test({
     outputCsv: true,
     medium: true,
     runs: 1,
@@ -16,5 +16,5 @@ function main () {
   });
 }
 if (typeof arango !== "undefined") {
-  main();
+  return main();
 }
diff --git a/simple/run-medium-all.js b/simple/run-medium-all.js
@@ -1,5 +1,5 @@
 function main () {
-  require("./simple/test").test({
+  return return require("./simple/test").test({
     outputCsv: true,
     medium: true,
 
@@ -15,5 +15,5 @@ function main () {
   });
 }
 if (typeof arango !== "undefined") {
-  main();
+  return return main();
 }
diff --git a/simple/run-medium-oneshard-regular-collections.js b/simple/run-medium-oneshard-regular-collections.js
@@ -1,10 +1,10 @@
 function main () {
-  require("./simple/test").test({
+  return require("./simple/test").test({
     medium: true,
     oneshardTests: true,
     numberOfShards: 5
   });
 }
 if (typeof arango !== "undefined") {
-  main();
+  return main();
 }
diff --git a/simple/run-medium-oneshard.js b/simple/run-medium-oneshard.js
@@ -1,9 +1,9 @@
 function main () {
-  require("./simple/test").test({
+  return require("./simple/test").test({
     medium: true,
     oneshardTests: true
   });
 }
 if (typeof arango !== "undefined") {
-  main();
+  return main();
 }
diff --git a/simple/run-medium-subquery.js b/simple/run-medium-subquery.js
@@ -1,9 +1,9 @@
 function main () {
-  require("./simple/test").test({
+  return require("./simple/test").test({
     medium: true,
     subqueryTests: true
   });
 }
 if (typeof arango !== "undefined") {
-  main();
+  return main();
 }
diff --git a/simple/run-small-all-junit.js b/simple/run-small-all-junit.js
@@ -1,5 +1,5 @@
 function main () {
-  require("./simple/test").test({
+  return require("./simple/test").test({
     outputXml: true,
     xmlDirectory: "xml",
 
@@ -15,5 +15,5 @@ function main () {
   });
 }
 if (typeof arango !== "undefined") {
-  main();
+  return main();
 }
diff --git a/simple/run-small-all.js b/simple/run-small-all.js
@@ -1,5 +1,5 @@
 function main () {
-  require("./simple/test").test({
+  return require("./simple/test").test({
     outputCsv: true,
     small: true,
 
@@ -14,5 +14,5 @@ function main () {
   });
 }
 if (typeof arango !== "undefined") {
-  main();
+  return main();
 }
diff --git a/simple/run-small-crud.js b/simple/run-small-crud.js
@@ -1,10 +1,10 @@
 function main () {
-  require("./simple/test").test({
+  return require("./simple/test").test({
     small: true,
 
     crud: true
   });
 }
 if (typeof arango !== "undefined") {
-  main();
+  return main();
 }
diff --git a/simple/run-small-documents.js b/simple/run-small-documents.js
@@ -1,10 +1,10 @@
 function main () {
-  require("./simple/test").test({
+  return require("./simple/test").test({
     small: true,
 
    documents: true
   });
 }
 if (typeof arango !== "undefined") {
-  main();
+  return main();
 }
diff --git a/simple/run-small-edges.js b/simple/run-small-edges.js
@@ -1,5 +1,5 @@
 function main () {
-  require("./simple/test").test({
+  return require("./simple/test").test({
     outputCsv: true,
     small: true,
 
@@ -12,5 +12,5 @@ function main () {
   });
 }
 if (typeof arango !== "undefined") {
-  main();
+  return main();
 }
diff --git a/simple/run-small-oneshard-regular-collections.js b/simple/run-small-oneshard-regular-collections.js
@@ -1,11 +1,11 @@
 function main () {
-  require("./simple/test").test({
+  return require("./simple/test").test({
     small: true,
 
     oneshardTests: true,
      numberOfShards: 5
   });
 }
 if (typeof arango !== "undefined") {
-  main();
+  return main();
 }
diff --git a/simple/run-small-oneshard.js b/simple/run-small-oneshard.js
@@ -1,9 +1,9 @@
 function main () {
-  require("./simple/test").test({
+  return require("./simple/test").test({
     small: true,
      oneshardTests: true
   });
 }
 if (typeof arango !== "undefined") {
-  main();
+  return main();
 }
diff --git a/simple/run-small-satellite-graphs.js b/simple/run-small-satellite-graphs.js
@@ -1,9 +1,9 @@
 function main () {
-  require("./simple/test").test({
+  return require("./simple/test").test({
     small: true,
     satelliteGraphTests: true
   });
 }
 if (typeof arango !== "undefined") {
-  main();
+  return main();
 }
diff --git a/simple/run-small-subquery.js b/simple/run-small-subquery.js
@@ -1,9 +1,9 @@
 function main () {
-  require("./simple/test").test({
+  return require("./simple/test").test({
     small: true,
     subqueryTests: true
   });
 }
 if (typeof arango !== "undefined") {
-  main();
+  return main();
 }
diff --git a/simple/run-tiny-all.js b/simple/run-tiny-all.js
@@ -1,5 +1,5 @@
 function main () {
-  require("./simple/test").test({
+  return require("./simple/test").test({
     outputCsv: true,
     tiny: true,
     small: false,
@@ -16,5 +16,5 @@ function main () {
   });
 }
 if (typeof arango !== "undefined") {
-  main();
+  return main();
 }
diff --git a/simple/run-tiny-crud-runs1.js b/simple/run-tiny-crud-runs1.js
@@ -1,11 +1,11 @@
 function main () {
-  require("./simple/test").test({
+  return require("./simple/test").test({
     outputCsv: true,
     tiny: true,
     runs: 1,
     crud: true
   });
 }
 if (typeof arango !== "undefined") {
-  main();
+  return main();
 }
diff --git a/simple/run-tiny-crud.js b/simple/run-tiny-crud.js
@@ -1,10 +1,10 @@
 function main () {
-  require("./simple/test").test({
+  return require("./simple/test").test({
     outputCsv: true,
     tiny: true,
     crud: true
   });
 }
 if (typeof arango !== "undefined") {
-  main();
+  return main();
 }
diff --git a/simple/test.js b/simple/test.js
@@ -94,6 +94,7 @@ function toAsciiTable(title, out) {
 };
 
 exports.test = function (global) {
+  global.returnValue = 0;
   global.tiny = global.tiny || false;
   global.small = global.small || false;
   global.medium = global.medium || false;
@@ -134,7 +135,7 @@ exports.test = function (global) {
   const isCluster = semver.satisfies(serverVersion, "<3.5.0") ? require("@arangodb/cluster").isCluster() : internal.isCluster();
 
   print(`Running against version ${serverVersion} ${isEnterprise ? "Enterprise" : ""} ${isCluster ? "Cluster" : ""}`);
-  
+  print(db._version(true));  
   const supportsAnalyzers = !semver.satisfies(serverVersion,
     "3.5.0-rc.1 || 3.5.0-rc.2 || 3.5.0-rc.3");
   const supportsSatelliteGraphs = semver.satisfies(serverVersion, ">=3.7.0-devel");
@@ -263,7 +264,8 @@ exports.test = function (global) {
       return { results: out, errors };
     };
 
-    return run(tests, options);
+    run(tests, options);
+    return global.returnValue;
   }; // testrunner
 
   const toJUnit = function (out, prefix, postfix) {
@@ -3065,6 +3067,7 @@ exports.test = function (global) {
         output += toAsciiTable(name, testsResults) + "\n\n";
         for (const err of errors) {
           output += `Test ${err.name} failed with exception: ${err.error}\n`;
+          global.returnValue = 1;
         }
 
         if (global.outputXml) {

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`function main () {`
`2`		`- require("./simple/test").test({`
	`2`	`+ return require("./simple/test").test({`
`3`	`3`	`outputCsv: true,`
`4`	`4`	`big: true,`
`5`	`5`	`runs: 1,`
`@@ -16,5 +16,5 @@ function main () {`
`16`	`16`	`});`
`17`	`17`	`}`
`18`	`18`	`if (typeof arango !== "undefined") {`
`19`		`- main();`
	`19`	`+ return main();`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,10 @@`
`1`	`1`	`function main () {`
`2`		`- require("./simple/test").test({`
	`2`	`+ return require("./simple/test").test({`
`3`	`3`	`outputCsv: true,`
`4`	`4`	`big: true,`
`5`	`5`	`crud: true`
`6`	`6`	`});`
`7`	`7`	`}`
`8`	`8`	`if (typeof arango !== "undefined") {`
`9`		`- main();`
	`9`	`+ return main();`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`function main () {`
`2`		`- require("./simple/test").test({`
	`2`	`+ return require("./simple/test").test({`
`3`	`3`	`medium: true,`
`4`	`4`	`oneshardTests: true`
`5`	`5`	`});`
`6`	`6`	`}`
`7`	`7`	`if (typeof arango !== "undefined") {`
`8`		`- main();`
	`8`	`+ return main();`
`9`	`9`	`}`