wip

Author: SiarheiFedartsou

features/lib/osrm_loader.js

@@ -6,6 +6,9 @@ const Timeout = require('node-timeout');
 const tryConnect = require('../lib/try_connect');
 const errorReason = require('./utils').errorReason;
 
+
+ const OSRM_ROUTED = 'node /Users/siarheifedartsou/work/osrm-backend/server/server.js';
+//const OSRM_ROUTED = 'osrm-routed';
 class OSRMBaseLoader{
     constructor (scope) {
         this.scope = scope;
@@ -45,10 +48,12 @@ class OSRMBaseLoader{
         var retryCount = 0;
         let retry = (err) => {
           if (err) {
-            if (retryCount < this.scope.OSRM_CONNECTION_RETRIES) {
-              const timeoutMs = 10 * Math.pow(this.scope.OSRM_CONNECTION_EXP_BACKOFF_COEF, retryCount);
+            if (retryCount < 10) {
+             // const timeoutMs = 10 * Math.pow(this.scope.OSRM_CONNECTION_EXP_BACKOFF_COEF, retryCount);
               retryCount++;
-              setTimeout(() => { tryConnect(this.scope.OSRM_IP, this.scope.OSRM_PORT, retry); }, timeoutMs);
+              setTimeout(() => {
+                tryConnect(this.scope.OSRM_IP, this.scope.OSRM_PORT, retry); 
+            }, 1000);
             } else {
               callback(new Error(`Could not connect to osrm-routed after ${this.scope.OSRM_CONNECTION_RETRIES} retries.`));
             }
@@ -79,7 +84,7 @@ class OSRMDirectLoader extends OSRMBaseLoader {
         if (this.osrmIsRunning()) return callback(new Error("osrm-routed already running!"));
 
         const command_arguments = util.format('%s -p %d -i %s -a %s', this.inputFile, this.scope.OSRM_PORT, this.scope.OSRM_IP, this.scope.ROUTING_ALGORITHM);
-        this.child = this.scope.runBin('osrm-routed', command_arguments, this.scope.environment, (err) => {
+        this.child = this.scope.runBin(OSRM_ROUTED, command_arguments, this.scope.environment, (err) => {
             if (err && err.signal !== 'SIGINT') {
                 this.child = null;
                 throw new Error(util.format('osrm-routed %s: %s', errorReason(err), err.cmd));
@@ -112,7 +117,7 @@ class OSRMmmapLoader extends OSRMBaseLoader {
         if (this.osrmIsRunning()) return callback(new Error("osrm-routed already running!"));
 
         const command_arguments = util.format('%s -p %d -i %s -a %s --mmap', this.inputFile, this.scope.OSRM_PORT, this.scope.OSRM_IP, this.scope.ROUTING_ALGORITHM);
-        this.child = this.scope.runBin('osrm-routed', command_arguments, this.scope.environment, (err) => {
+        this.child = this.scope.runBin(OSRM_ROUTED, command_arguments, this.scope.environment, (err) => {
             if (err && err.signal !== 'SIGINT') {
                 this.child = null;
                 throw new Error(util.format('osrm-routed %s: %s', errorReason(err), err.cmd));
@@ -159,7 +164,7 @@ class OSRMDatastoreLoader extends OSRMBaseLoader {
         if (this.osrmIsRunning()) return callback();
 
         const command_arguments = util.format('--dataset-name=%s -s -i %s -p %d -a %s', this.scope.DATASET_NAME, this.scope.OSRM_IP, this.scope.OSRM_PORT, this.scope.ROUTING_ALGORITHM);
-        this.child = this.scope.runBin('osrm-routed', command_arguments, this.scope.environment, (err) => {
+        this.child = this.scope.runBin(OSRM_ROUTED, command_arguments, this.scope.environment, (err) => {
             if (err && err.signal !== 'SIGINT') {
                 this.child = null;
                 throw new Error(util.format('osrm-routed %s: %s', errorReason(err), err.cmd));

features/support/hooks.js

@@ -51,7 +51,7 @@ module.exports = function () {
             .defer(rimraf, this.scenarioLogFile)
             .awaitAll(callback);
         // uncomment to get path to logfile
-        // console.log('  Writing logging output to ' + this.scenarioLogFile);
+         console.log('  Writing logging output to ' + this.scenarioLogFile);
     });
 
     this.After((scenario, callback) => {

features/support/run.js

@@ -38,8 +38,16 @@ module.exports = function () {
     };
 
     this.runBin = (bin, options, env, callback) => {
-        let cmd = path.resolve(util.format('%s/%s%s', this.BIN_PATH, bin, this.EXE));
+        let cmd = bin;
+        // if cmd has prefix
+
         let opts = options.split(' ').filter((x) => { return x && x.length > 0; });
+        if (!cmd.startsWith('node')) {
+            cmd = path.resolve(util.format('%s/%s%s', this.BIN_PATH, bin, this.EXE));
+        } else {
+            opts = ['/Users/siarheifedartsou/work/osrm-backend/server/server.js'].concat(opts);
+            cmd = '/Users/siarheifedartsou/.nvm/versions/node/v16.13.2/bin/node';
+        }
         let log = fs.createWriteStream(this.scenarioLogFile, {'flags': 'a'});
         log.write(util.format('*** running %s %s\n', cmd, options));
         // we need to set a large maxbuffer here because we have long running processes like osrm-routed