datagrok-tools 4.13.43 → 4.13.45

package/CHANGELOG.md

@@ -1,6 +1,18 @@
 # Datagrok-tools changelog
 
 
+## 4.13.45 (2024-12-12)
+
+### Features
+
+* Test all workers count variable fixes
+
+## 4.13.44 (2024-12-06)
+
+### Features
+
+* Test fixed infinite testing 
+
 ## 4.13.43 (2024-12-02)
 
 ### Features

package/bin/commands/help.js

@@ -13,7 +13,7 @@ var HELP_CREATE = "\nUsage: grok create [name]\n\nCreate a package:\n\ngrok crea
 var HELP_PUBLISH = "\nUsage: grok publish [host]\n\nUpload a package\n\nOptions:\n[--build|--rebuild] [--debug|--release] [-k | --key] [--suffix] [--all] [--refresh] [--link]\n\n--all             Publish all available packages \n--refresh         Publish all available already loaded packages \n--link  \t        Link the package to local utils\n\nRunning `grok publish` is the same as running `grok publish defaultHost --build --debug`\n";
 var HELP_CHECK = "\nUsage: grok check\n\nOptions:\n[-r | --recursive]\n\n--recursive       Check all packages in the current directory\n\nCheck package content (function signatures, import statements of external modules, etc.)\n";
 var HELP_TEST = "\nUsage: grok test\n\nOptions:\n[--package] [--category] [--test] [--host] [--csv] [--gui] [--skip-build] [--skip-publish] [--link] [--catchUnhandled] [--report] [--record] [--verbose] [--platform] [--benchmark] [--stress-test]\n\n--package           Specify a package name to run tests for\n--category          Specify a category name to run tests for\n--test              Specify a test name to run \n--host              Host alias as in the config file\n--csv               Save the test report in a CSV file\n--gui               Launch graphical interface (non-headless mode)\n--catchUnhandled    Catch unhandled exceptions during test execution (default=true)\n--report            Report failed tests to audit, notifies package author (default=false)\n--skip-build        Skip the package build step\n--skip-publish      Skip the package publication step\n--link  \t          Link the package to local utils\n--record            Records the test execution process in mp4 format\n--verbose           Prints detailed information about passed and skipped tests in the console\n--platform          Runs only platform tests (applicable for ApiTests package only)\n--core              Runs package & auto tests & core tests (core tests run only from DevTools package)\n--benchmark   \t    Runs tests in benchmark mode\n--stress-test       Runs shuffled stress-test only\n \nRun package tests\n\nSee instructions:\nhttps://datagrok.ai/help/develop/how-to/test-packages#local-testing\n";
-var HELP_TESTALL = "\nUsage: grok testall\n\nOptions:\n[--packages] [--host] [--csv] [--gui] [--skip-build] [--skip-publish] [--link-package] [--catchUnhandled] [--report] [--record] [--verbose] [--benchmark] [--stress-test] [--order] [--tags] [--testRepeat] [--workersCount]\n\n--packages          Specify a packages names to run tests for\n--host              Host alias as in the config file\n--csv               Save the test report in a CSV file\n--gui               Launch graphical interface (non-headless mode)\n--catchUnhandled    Catch unhandled exceptions during test execution (default=true)\n--report            Report failed tests to audit, notifies packages author (default=false)\n--skip-build        Skip the packages build step\n--skip-publish      Skip the packages publication step\n--link-package  \t  Link the packages to local utils\n--record            Records the test execution process in mp4 format\n--verbose           Prints detailed information about passed and skipped tests in the console\n--core              Runs packages & core tests (applicable  for DevTools packages only)\n--benchmark   \t    Runs tests in benchmark mode\n--stress-test       Runs shuffled stress-test only\n--order             Specify order for tests invocation\n--tags              Filter tests by tag name for run\n--testRepeat        Set amount of tests repeats\n--workersCount      Set amount of workers for tests run\n\nRun tests of all or specified packages \n\nSee instructions:\nhttps://datagrok.ai/help/develop/how-to/test-packages#local-testing\n";
+var HELP_TESTALL = "\nUsage: grok testall\n\nOptions:\n[--packages] [--host] [--csv] [--gui] [--skip-build] [--skip-publish] [--link-package] [--catchUnhandled] [--report] [--record] [--verbose] [--benchmark] [--stress-test] [--order] [--tags] [--testRepeat] [--workers-count]\n\n--packages          Specify a packages names to run tests for\n--host              Host alias as in the config file\n--csv               Save the test report in a CSV file\n--gui               Launch graphical interface (non-headless mode)\n--catchUnhandled    Catch unhandled exceptions during test execution (default=true)\n--report            Report failed tests to audit, notifies packages author (default=false)\n--skip-build        Skip the packages build step\n--skip-publish      Skip the packages publication step\n--link-package  \t  Link the packages to local utils\n--record            Records the test execution process in mp4 format\n--verbose           Prints detailed information about passed and skipped tests in the console\n--core              Runs packages & core tests (applicable  for DevTools packages only)\n--benchmark   \t    Runs tests in benchmark mode\n--stress-test       Runs shuffled stress-test only\n--order             Specify order for tests invocation\n--tags              Filter tests by tag name for run\n--testRepeat        Set amount of tests repeats\n--workers-count      Set amount of workers for tests run\n\nRun tests of all or specified packages \n\nSee instructions:\nhttps://datagrok.ai/help/develop/how-to/test-packages#local-testing\n";
 var HELP_LINK = "\nUsage: grok link\n\nLink `datagrok-api` and libraries for local development\n";
 
 // const HELP_MIGRATE = `

package/bin/commands/test-all.js

@@ -83,7 +83,7 @@ function _testAll() {
         case 10:
           filteredTests = _context.sent;
           _context.next = 13;
-          return setWorkersOrder(filteredTests, getEnumOrder((_args$order = args.order) !== null && _args$order !== void 0 ? _args$order : ''), args.workersCount, args.testRepeat);
+          return setWorkersOrder(filteredTests, getEnumOrder((_args$order = args.order) !== null && _args$order !== void 0 ? _args$order : ''), args['workers-count'], args.testRepeat);
         case 13:
           workersOrder = _context.sent;
           _context.next = 16;
@@ -296,27 +296,16 @@ function _runTests() {
             _iterator3.f();
           }
           workersPromises = [];
-          _i = 0, _workersCommands = workersCommands;
-        case 5:
-          if (!(_i < _workersCommands.length)) {
-            _context5.next = 13;
-            break;
+          for (_i = 0, _workersCommands = workersCommands; _i < _workersCommands.length; _i++) {
+            workerCommands = _workersCommands[_i];
+            workersPromises.push((0, _testUtils.runWorker)(workerCommands, workerOptions, workersStarted++, testInvocationTimeout));
           }
-          workerCommands = _workersCommands[_i];
-          workersPromises.push((0, _testUtils.runWorker)(workerCommands, workerOptions, workersStarted++, testInvocationTimeout));
-          _context5.next = 10;
-          return workersPromises[workersPromises.length];
-        case 10:
-          _i++;
-          _context5.next = 5;
-          break;
-        case 13:
-          _context5.next = 15;
+          _context5.next = 7;
           return Promise.all(workersPromises);
-        case 15:
+        case 7:
           resultObjects = _context5.sent;
           return _context5.abrupt("return", resultObjects);
-        case 17:
+        case 9:
         case "end":
           return _context5.stop();
       }

package/bin/commands/test.js

@@ -24,7 +24,7 @@ function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; } /* eslint-disable max-len */
 var testInvocationTimeout = 3600000;
-var availableCommandOptions = ['host', 'package', 'csv', 'gui', 'catchUnhandled', 'platform', 'core', 'report', 'skip-build', 'skip-publish', 'path', 'record', 'verbose', 'benchmark', 'category', 'test', 'stress-test', 'link', 'tag'];
+var availableCommandOptions = ['host', 'package', 'csv', 'gui', 'catchUnhandled', 'platform', 'core', 'report', 'skip-build', 'skip-publish', 'path', 'record', 'verbose', 'benchmark', 'category', 'test', 'stress-test', 'link', 'tag', 'ci-cd'];
 var curDir = process.cwd();
 var grokDir = _path["default"].join(_os["default"].homedir(), '.grok');
 var confPath = _path["default"].join(grokDir, 'config.yaml');
@@ -137,7 +137,7 @@ function _runTesting() {
           workerId = 1;
           _context3.next = 14;
           return (0, _testUtils.timeout)( /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
-            var _args$benchmark, _args$catchUnhandled, _args$gui, _args$record, _args$report, _args$verbose, testsLeft, testsToReproduce, _iterator2, _step2, testData, reproduced, _iterator3, _step3, _test2, _reproducedTest2;
+            var _args$benchmark, _args$catchUnhandled, _args$gui, _args$record, _args$report, _args$verbose, _args$ciCd, testsLeft, testsToReproduce, _iterator2, _step2, testData, reproduced, _iterator3, _step3, _test2, _reproducedTest2;
             return _regenerator["default"].wrap(function _callee2$(_context2) {
               while (1) switch (_context2.prev = _context2.next) {
                 case 0:
@@ -149,6 +149,7 @@ function _runTesting() {
                     record: (_args$record = args.record) !== null && _args$record !== void 0 ? _args$record : false,
                     report: (_args$report = args.report) !== null && _args$report !== void 0 ? _args$report : false,
                     verbose: (_args$verbose = args.verbose) !== null && _args$verbose !== void 0 ? _args$verbose : false,
+                    ciCd: (_args$ciCd = args['ci-cd']) !== null && _args$ciCd !== void 0 ? _args$ciCd : false,
                     stopOnTimeout: true
                   }, workerId, testInvocationTimeout);
                 case 2:
@@ -159,7 +160,7 @@ function _runTesting() {
                   try {
                     for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
                       testData = _step2.value;
-                      if (!r.csv.includes("".concat(testData.params.category, ",").concat(testData.params.test))) testsLeft.push(testData);
+                      if (!r.verbosePassed.includes("".concat(testData.params.category, ": ").concat(testData.params.test)) && !r.verboseSkipped.includes("".concat(testData.params.category, ": ").concat(testData.params.test)) && !r.verboseFailed.includes("".concat(testData.params.category, ": ").concat(testData.params.test)) && !new RegExp("".concat(testData.params.category.trim(), "[^\\n]*: (before|after)")).test(r.verboseFailed)) testsLeft.push(testData);
                       if (r.verboseFailed.includes("".concat(testData.params.category, ": ").concat(testData.params.test, " :  Error:"))) {
                         testsToReproduce.push(testData);
                       }
@@ -242,7 +243,7 @@ function reproducedTest(_x3, _x4) {
 }
 function _reproducedTest() {
   _reproducedTest = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(args, testsToReproduce) {
-    var res, _iterator4, _step4, _args$benchmark2, _test3, r;
+    var res, _iterator4, _step4, _args$benchmark2, _args$ciCd2, _test3, r;
     return _regenerator["default"].wrap(function _callee4$(_context4) {
       while (1) switch (_context4.prev = _context4.next) {
         case 0:
@@ -265,7 +266,8 @@ function _reproducedTest() {
             report: false,
             verbose: false,
             stopOnTimeout: true,
-            reproduce: true
+            reproduce: true,
+            ciCd: (_args$ciCd2 = args['ci-cd']) !== null && _args$ciCd2 !== void 0 ? _args$ciCd2 : false
           }, 0, testInvocationTimeout);
         case 8:
           r = _context4.sent;

package/bin/utils/test-utils.js

@@ -664,6 +664,7 @@ function _runWorker() {
                   return page.evaluate(function (testData, options) {
                     if (options.benchmark) window.DG.Test.isInBenchmark = true;
                     if (options.reproduce) window.DG.Test.isReproducing = true;
+                    if (options.ciCd) window.DG.Test.isCiCd = true;
                     return new Promise(function (resolve, reject) {
                       window.DG.Utils.executeTests(testData, options.stopOnTimeout).then(function (results) {
                         resolve(results);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "datagrok-tools",
-  "version": "4.13.43",
+  "version": "4.13.45",
   "description": "Utility to upload and publish packages to Datagrok",
   "homepage": "https://github.com/datagrok-ai/public/tree/master/tools#readme",
   "dependencies": {