feat: Add pending status (#924)

microsoft · Jan 16, 2020 · 7cfa0ab · 7cfa0ab
1 parent e637de0
commit 7cfa0ab
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 5 deletions.
diff --git a/resources/media/dark/pending.svg b/resources/media/dark/pending.svg
diff --git a/resources/media/light/pending.svg b/resources/media/light/pending.svg
diff --git a/src/explorer/testExplorer.ts b/src/explorer/testExplorer.ts
@@ -102,6 +102,11 @@ export class TestExplorer implements TreeDataProvider<ITestItem>, Disposable {
                                 dark: this._context.asAbsolutePath(path.join('resources', 'media', 'dark', 'running.svg')),
                                 light: this._context.asAbsolutePath(path.join('resources', 'media', 'light', 'running.svg')),
                             };
+                        case TestStatus.Pending:
+                            return {
+                                dark: this._context.asAbsolutePath(path.join('resources', 'media', 'dark', 'pending.svg')),
+                                light: this._context.asAbsolutePath(path.join('resources', 'media', 'light', 'pending.svg')),
+                            };
                         default:
                             break;
                     }

diff --git a/src/runners/baseRunner/BaseRunner.ts b/src/runners/baseRunner/BaseRunner.ts
@@ -37,7 +37,7 @@ export abstract class BaseRunner implements ITestRunner {
             this.flattenTestIds(test, flattenedTestIds);
         }
         this.testIds = flattenedTestIds;
-        this.updateTestResultsToRunning();
+        this.updateTestResultsToPending();
     }
 
     public async run(launchConfiguration: DebugConfiguration): Promise<Set<string>> {
@@ -103,7 +103,7 @@ export abstract class BaseRunner implements ITestRunner {
         for (const id of this.testIds) {
             const result: ITestResult | undefined = testResultManager.getResultById(id);
             // In case that unexpected errors terminate the execution
-            if (result && result.status === TestStatus.Running) {
+            if (result && (result.status === TestStatus.Pending || result.status === TestStatus.Running)) {
                 result.status = undefined;
                 testResultManager.storeResult(result);
             }
@@ -188,12 +188,12 @@ export abstract class BaseRunner implements ITestRunner {
         throw new Error(`Failed to find path: ${fullPath}`);
     }
 
-    private updateTestResultsToRunning(): void {
+    private updateTestResultsToPending(): void {
         const runningResults: ITestResult[] = [];
         for (const id of this.testIds) {
             runningResults.push({
                 id,
-                status: TestStatus.Running,
+                status: TestStatus.Pending,
             });
         }
         testResultManager.storeResult(...runningResults);

diff --git a/src/runners/baseRunner/BaseRunnerResultAnalyzer.ts b/src/runners/baseRunner/BaseRunnerResultAnalyzer.ts
@@ -37,7 +37,7 @@ export abstract class BaseRunnerResultAnalyzer {
         for (const id of this.testIds) {
             const result: ITestResult | undefined = testResultManager.getResultById(id);
             // In case that unexpected errors terminate the execution
-            if (result && (!result.status || result.status === TestStatus.Running)) {
+            if (result && (!result.status || result.status === TestStatus.Pending || result.status === TestStatus.Running)) {
                 testResultManager.removeResultById(id);
                 this.testIds.delete(id);
             }

diff --git a/src/runners/junitRunner/JUnitRunnerResultAnalyzer.ts b/src/runners/junitRunner/JUnitRunnerResultAnalyzer.ts
@@ -38,6 +38,8 @@ export class JUnitRunnerResultAnalyzer extends BaseRunnerResultAnalyzer {
                     id: testId,
                     status: TestStatus.Running,
                 };
+            } else if (result.status === TestStatus.Pending) {
+                result.status = TestStatus.Running;
             }
             const start: number = Date.now();
             if (data.indexOf(MessageId.IGNORE_TEST_PREFIX) > -1) {

diff --git a/src/runners/models.ts b/src/runners/models.ts
@@ -13,6 +13,7 @@ export interface ITestResult {
 }
 
 export enum TestStatus {
+    Pending = 'Pending',
     Running = 'Running',
     Pass = 'Pass',
     Fail = 'Fail',