2

DevExpress · Sep 6, 2018 · 93b48a3 · 93b48a3
1 parent 1c70c9c
commit 93b48a3
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/test-run/index.js b/src/test-run/index.js
@@ -373,18 +373,23 @@ export default class TestRun extends EventEmitter {
     }
 
     _resolveCurrentDriverTask (result) {
+
         this.currentDriverTask.resolve(result);
         this.driverTaskQueue.shift();
 
+        console.log('_resolveCurrentDriverTask: ' + this.test.name + ' length: ' + this.driverTaskQueue.length);
+
         if (this.testDoneCommandQueued)
             this._removeAllNonServiceTasks();
     }
 
     _rejectCurrentDriverTask (err) {
-        if (!this.driverTaskQueue[0])
+        if (!this.driverTaskQueue[0]) {
+            console.log(this.test.name);
             console.log('no task');
+        }
 
-        err.callsite             = err.callsite || this.driverTaskQueue[0].callsite;
+        err.callsite             = err.callsite || this.currentDriverTask.callsite;
         err.isRejectedDriverTask = true;
 
         this.currentDriverTask.reject(err);
@@ -684,7 +689,8 @@ export default class TestRun extends EventEmitter {
         console.log('disconnect: ' + this.browserConnection.id + ' ' + this.browserConnection.userAgent);
         this.disconnected = true;
 
-        this._rejectCurrentDriverTask(err);
+        if (this.currentDriverTask)
+            this._rejectCurrentDriverTask(err);
 
         this.emit('disconnected', err);