diff --git a/features/lib/osrm_loader.js b/features/lib/osrm_loader.js index 2345336c5..27980cf41 100644 --- a/features/lib/osrm_loader.js +++ b/features/lib/osrm_loader.js @@ -78,9 +78,10 @@ class OSRMDirectLoader extends OSRMBaseLoader { if (this.osrmIsRunning()) return callback(new Error("osrm-routed already running!")); this.child = this.scope.runBin('osrm-routed', util.format("%s -p %d", this.inputFile, this.scope.OSRM_PORT), this.scope.environment, (err) => { - if (err && err.signal !== 'SIGINT') { - throw new Error(util.format('osrm-routed %s: %s', errorReason(err), err.cmd)); - } + if (err && err.signal !== 'SIGINT') { + this.child = null; + throw new Error(util.format('osrm-routed %s: %s', errorReason(err), err.cmd)); + } }); callback(); } @@ -116,6 +117,7 @@ class OSRMDatastoreLoader extends OSRMBaseLoader { this.child = this.scope.runBin('osrm-routed', util.format('--shared-memory=1 -p %d', this.scope.OSRM_PORT), 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)); } }); diff --git a/features/support/cache.js b/features/support/cache.js index c312d2f26..96a81404d 100644 --- a/features/support/cache.js +++ b/features/support/cache.js @@ -141,7 +141,9 @@ module.exports = function() { // converts the scenario titles in file prefixes this.getScenarioID = (scenario) => { - let name = scenario.getName().toLowerCase().replace(/[\/\-'=,\(\):\*#]/g, '').replace(/\s/g, '_').replace(/__/g, '_').replace(/\.\./g, '.'); + let name = scenario.getName().toLowerCase().replace(/[\/\-'=,\(\):\*#]/g, '') + .replace(/\s/g, '_').replace(/__/g, '_').replace(/\.\./g, '.') + .substring(0, 64); return util.format('%d_%s', scenario.getLine(), name); };