if we catch an error, we shouldn't return 0. (#61)

dothebart · web-flow · commit 8095b0a272de · 2025-02-25T17:19:11.000+03:00
* if we catch an error, we shouldn't return 0.

* fix GLOBAL, variable referencing

* remove debug throw
diff --git a/simple/run-big-all-runs1.js b/simple/run-big-all-runs1.js
@@ -1,5 +1,5 @@
 function main () {
-  global.returnValue = 0;
+  GLOBAL.returnValue = 0;
   require("./simple/test").test({
     outputCsv: true,
     big: true,
@@ -16,7 +16,7 @@ function main () {
     subqueryTests: true,
     mditests: true
   });
-  return global.returnValue;
+  return GLOBAL.returnValue;
 }
 if (typeof arango !== "undefined") {
   process.exit(main());
diff --git a/simple/run-big-all.js b/simple/run-big-all.js
@@ -1,5 +1,5 @@
 function main () {
-  global.returnValue = 0;
+  GLOBAL.returnValue = 0;
   require("./simple/test").test({
     outputCsv: true,
     big: true,
@@ -16,7 +16,7 @@ function main () {
     subqueryTests: true,
     mditests: true
   });
-  return global.returnValue;
+  return GLOBAL.returnValue;
 }
 if (typeof arango !== "undefined") {
   process.exit(main());
diff --git a/simple/run-big-crud.js b/simple/run-big-crud.js
@@ -1,11 +1,11 @@
 function main () {
-  global.returnValue = 0;
+  GLOBAL.returnValue = 0;
   require("./simple/test").test({
     outputCsv: true,
     big: true,
     crud: true
   });
-  return global.returnValue;
+  return GLOBAL.returnValue;
 }
 if (typeof arango !== "undefined") {
   process.exit(main());
diff --git a/simple/run-mdi.js b/simple/run-mdi.js
@@ -1,5 +1,5 @@
 function main () {
-  global.returnValue = 0;
+  GLOBAL.returnValue = 0;
   require("./simple-performance-test/simple/test").test({
     outputCsv: false,
     medium: true,
@@ -15,7 +15,7 @@ function main () {
     subqueryTests: false,
     mditests: true
   });
-  return global.returnValue;
+  return GLOBAL.returnValue;
 }
 if (typeof arango !== "undefined") {
   process.exit(main());
diff --git a/simple/run-medium-all-runs1.js b/simple/run-medium-all-runs1.js
@@ -1,5 +1,5 @@
 function main () {
-  global.returnValue = 0;
+  GLOBAL.returnValue = 0;
   require("./simple/test").test({
     outputCsv: true,
     medium: true,
@@ -16,7 +16,7 @@ function main () {
     subqueryTests: true,
     mditests: true
   });
-  return global.returnValue;
+  return GLOBAL.returnValue;
 }
 if (typeof arango !== "undefined") {
   process.exit(main());
diff --git a/simple/run-medium-all.js b/simple/run-medium-all.js
@@ -1,5 +1,5 @@
 function main () {
-  global.returnValue = 0;
+  GLOBAL.returnValue = 0;
   require("./simple/test").test({
     outputCsv: true,
     medium: true,
@@ -16,7 +16,7 @@ function main () {
     subqueryTests: true,
     mditests: true
   });
-  return global.returnValue;
+  return GLOBAL.returnValue;
 }
 if (typeof arango !== "undefined") {
   process.exit(main());
diff --git a/simple/run-medium-oneshard-regular-collections.js b/simple/run-medium-oneshard-regular-collections.js
@@ -1,11 +1,11 @@
 function main () {
-  global.returnValue = 0;
+  GLOBAL.returnValue = 0;
   require("./simple/test").test({
     medium: true,
     oneshardTests: true,
     numberOfShards: 5
   });
-  return global.returnValue;
+  return GLOBAL.returnValue;
 }
 if (typeof arango !== "undefined") {
   process.exit(main());
diff --git a/simple/run-medium-oneshard.js b/simple/run-medium-oneshard.js
@@ -1,10 +1,10 @@
 function main () {
-  global.returnValue = 0;
+  GLOBAL.returnValue = 0;
   require("./simple/test").test({
     medium: true,
     oneshardTests: true
   });
-  return global.returnValue;
+  return GLOBAL.returnValue;
 }
 if (typeof arango !== "undefined") {
   process.exit(main());
diff --git a/simple/run-medium-subquery.js b/simple/run-medium-subquery.js
@@ -1,10 +1,10 @@
 function main () {
-  global.returnValue = 0;
+  GLOBAL.returnValue = 0;
   require("./simple/test").test({
     medium: true,
     subqueryTests: true
   });
-  return global.returnValue;
+  return GLOBAL.returnValue;
 }
 if (typeof arango !== "undefined") {
   process.exit(main());
diff --git a/simple/run-small-all-junit.js b/simple/run-small-all-junit.js
@@ -1,5 +1,5 @@
 function main () {
-  global.returnValue = 0;
+  GLOBAL.returnValue = 0;
   require("./simple/test").test({
     outputXml: true,
     xmlDirectory: "xml",
@@ -15,7 +15,7 @@ function main () {
     crudSearch: true,
     mditests: true
   });
-  return global.returnValue;
+  return GLOBAL.returnValue;
 }
 if (typeof arango !== "undefined") {
   process.exit(main());
diff --git a/simple/run-small-all.js b/simple/run-small-all.js
@@ -1,5 +1,5 @@
 function main () {
-  global.returnValue = 0;
+  GLOBAL.returnValue = 0;
   require("./simple/test").test({
     outputCsv: true,
     small: true,
@@ -15,7 +15,7 @@ function main () {
     crudSearch: true,
     mditests: true
   });
-  return global.returnValue;
+  return GLOBAL.returnValue;
 }
 if (typeof arango !== "undefined") {
   process.exit(main());
diff --git a/simple/run-small-crud.js b/simple/run-small-crud.js
@@ -1,11 +1,11 @@
 function main () {
-  global.returnValue = 0;
+  GLOBAL.returnValue = 0;
   require("./simple/test").test({
     small: true,
 
     crud: true
   });
-  return global.returnValue;
+  return GLOBAL.returnValue;
 }
 if (typeof arango !== "undefined") {
   process.exit(main());
diff --git a/simple/run-small-documents.js b/simple/run-small-documents.js
@@ -1,11 +1,11 @@
 function main () {
-  global.returnValue = 0;
+  GLOBAL.returnValue = 0;
   require("./simple/test").test({
     small: true,
 
    documents: true
   });
-  return global.returnValue;
+  return GLOBAL.returnValue;
 }
 if (typeof arango !== "undefined") {
   process.exit(main());
diff --git a/simple/run-small-edges.js b/simple/run-small-edges.js
@@ -1,5 +1,5 @@
 function main () {
-  global.returnValue = 0;
+  GLOBAL.returnValue = 0;
   require("./simple/test").test({
     outputCsv: true,
     small: true,
@@ -11,7 +11,7 @@ function main () {
     crud: false,
     crudSearch: false
   });
-  return global.returnValue;
+  return GLOBAL.returnValue;
 }
 if (typeof arango !== "undefined") {
   process.exit(main());
diff --git a/simple/run-small-oneshard-regular-collections.js b/simple/run-small-oneshard-regular-collections.js
@@ -1,12 +1,12 @@
 function main () {
-  global.returnValue = 0;
+  GLOBAL.returnValue = 0;
   require("./simple/test").test({
     small: true,
 
     oneshardTests: true,
      numberOfShards: 5
   });
-  return global.returnValue;
+  return GLOBAL.returnValue;
 }
 if (typeof arango !== "undefined") {
   process.exit(main());
diff --git a/simple/run-small-oneshard.js b/simple/run-small-oneshard.js
@@ -1,10 +1,10 @@
 function main () {
-  global.returnValue = 0;
+  GLOBAL.returnValue = 0;
   require("./simple/test").test({
     small: true,
      oneshardTests: true
   });
-  return global.returnValue;
+  return GLOBAL.returnValue;
 }
 if (typeof arango !== "undefined") {
   process.exit(main());
diff --git a/simple/run-small-satellite-graphs.js b/simple/run-small-satellite-graphs.js
@@ -1,10 +1,10 @@
 function main () {
-  global.returnValue = 0;
+  GLOBAL.returnValue = 0;
   require("./simple/test").test({
     small: true,
     satelliteGraphTests: true
   });
-  return global.returnValue;
+  return GLOBAL.returnValue;
 }
 if (typeof arango !== "undefined") {
   process.exit(main());
diff --git a/simple/run-small-subquery.js b/simple/run-small-subquery.js
@@ -1,10 +1,10 @@
 function main () {
-  global.returnValue = 0;
+  GLOBAL.returnValue = 0;
   require("./simple/test").test({
     small: true,
     subqueryTests: true
   });
-  return global.returnValue;
+  return GLOBAL.returnValue;
 }
 if (typeof arango !== "undefined") {
   process.exit(main());
diff --git a/simple/run-tiny-all.js b/simple/run-tiny-all.js
@@ -1,5 +1,5 @@
 function main () {
-  global.returnValue = 0;
+  GLOBAL.returnValue = 0;
   require("./simple/test").test({
     outputCsv: true,
     tiny: true,
@@ -17,7 +17,7 @@ function main () {
     subqueryTests: true,
     mditests: true
   });
-  return global.returnValue;
+  return GLOBAL.returnValue;
 }
 if (typeof arango !== "undefined") {
   process.exit(main());
diff --git a/simple/run-tiny-crud-runs1.js b/simple/run-tiny-crud-runs1.js
@@ -1,12 +1,12 @@
 function main () {
-  global.returnValue = 0;
+  GLOBAL.returnValue = 0;
   require("./simple/test").test({
     outputCsv: true,
     tiny: true,
     runs: 1,
     crud: true
   });
-  return global.returnValue;
+  return GLOBAL.returnValue;
 }
 if (typeof arango !== "undefined") {
   process.exit(main());
diff --git a/simple/run-tiny-crud.js b/simple/run-tiny-crud.js
@@ -1,11 +1,11 @@
 function main () {
-  global.returnValue = 0;
+  GLOBAL.returnValue = 0;
   require("./simple/test").test({
     outputCsv: true,
     tiny: true,
     crud: true
   });
-  return global.returnValue;
+  return GLOBAL.returnValue;
 }
 if (typeof arango !== "undefined") {
   process.exit(main());
diff --git a/simple/test-oneshard.js b/simple/test-oneshard.js
@@ -1,5 +1,5 @@
-/* jshint globalstrict:false, strict:false */
-/* global print */
+/* jshint GLOBALstrict:false, strict:false */
+/* GLOBAL print */
 
 const batchSize = 5000;
 const db = require("@arangodb").db;
@@ -8,7 +8,7 @@ const time = internal.time;
 
 const tearDown = (show_topic = true) => {
   if (show_topic) {
-    print("global teardown oneshard");
+    print("GLOBAL teardown oneshard");
   }
 
   print("dropping search");
@@ -26,7 +26,7 @@ const setup = (options) => {
   let scale = options.scale;
   let numberOfShards = options.numberOfShards;
   let replicationFactor = options.replicationFactor;
-  print("global setup oneshard - scale: " + scale);
+  print("GLOBAL setup oneshard - scale: " + scale);
 
   require("@arangodb/aql/queries").properties({ slowQueryThreshold: 999999999999 });
   tearDown(false);
diff --git a/simple/test.js b/simple/test.js
