Use built-in refresh tests mechanism (#19035)

kimadeline · web-flow · commit 111e58cdda47 · 2022-05-02T12:30:15.000-07:00
* Fix restartLS command disposal

* Use built-in refresh tests mechanism

* Accidental testing.reRunFailTests deletion
diff --git a/news/2 Fixes/19012.md b/news/2 Fixes/19012.md
@@ -0,0 +1 @@
+Use built-in test refresh button.
diff --git a/package.json b/package.json
@@ -327,27 +327,6 @@
                 "icon": "$(refresh)",
                 "title": "%python.command.python.refreshTensorBoard.title%"
             },
-            {
-                "category": "Test",
-                "command": "python.refreshTests",
-                "icon": "$(refresh)",
-                "title": "%python.command.python.refreshTests.title%"
-            },
-            {
-                "category": "Test",
-                "command": "python.refreshingTests",
-                "icon": {
-                    "dark": "resources/dark/discovering-tests.svg",
-                    "light": "resources/light/discovering-tests.svg"
-                },
-                "title": "%python.command.python.refreshingTests.title%"
-            },
-            {
-                "category": "Test",
-                "command": "python.stopRefreshingTests",
-                "icon": "$(beaker-stop)",
-                "title": "%python.command.python.stopRefreshingTests.title%"
-            },
             {
                 "category": "Python",
                 "command": "python.reportIssue",
@@ -1607,30 +1586,6 @@
                     "title": "%python.command.python.refreshTensorBoard.title%",
                     "when": "!virtualWorkspace && shellExecutionSupported"
                 },
-                {
-                    "category": "Test",
-                    "command": "python.refreshTests",
-                    "icon": "$(refresh)",
-                    "title": "%python.command.python.refreshTests.title%",
-                    "when": "!virtualWorkspace && shellExecutionSupported"
-                },
-                {
-                    "category": "Test",
-                    "command": "python.refreshingTests",
-                    "icon": {
-                        "dark": "resources/dark/discovering-tests.svg",
-                        "light": "resources/light/discovering-tests.svg"
-                    },
-                    "title": "%python.command.python.refreshingTests.title%",
-                    "when": "!virtualWorkspace && shellExecutionSupported"
-                },
-                {
-                    "category": "Test",
-                    "command": "python.stopRefreshingTests",
-                    "icon": "$(beaker-stop)",
-                    "title": "%python.command.python.stopRefreshingTests.title%",
-                    "when": "!virtualWorkspace && shellExecutionSupported"
-                },
                 {
                     "category": "Python",
                     "command": "python.reportIssue",
@@ -1747,21 +1702,6 @@
                 }
             ],
             "view/title": [
-                {
-                    "command": "python.refreshTests",
-                    "when": "view == workbench.view.testing && !refreshingTests && !virtualWorkspace && shellExecutionSupported",
-                    "group": "navigation@0"
-                },
-                {
-                    "command": "python.refreshingTests",
-                    "when": "view == workbench.view.testing && refreshingTests && !virtualWorkspace && shellExecutionSupported",
-                    "group": "navigation@0"
-                },
-                {
-                    "command": "python.stopRefreshingTests",
-                    "when": "view == workbench.view.testing && refreshingTests && !virtualWorkspace && shellExecutionSupported",
-                    "group": "navigation@0"
-                },
                 {
                     "command": "testing.reRunFailTests",
                     "when": "view == workbench.view.testing && hasFailedTests && !virtualWorkspace && shellExecutionSupported",
diff --git a/package.nls.json b/package.nls.json
@@ -11,9 +11,6 @@
     "python.command.python.viewOutput.title": "Show Output",
     "python.command.python.viewLanguageServerOutput.title": "Show Language Server Output",
     "python.command.python.configureTests.title": "Configure Tests",
-    "python.command.python.refreshTests.title": "Refresh Tests",
-    "python.command.python.refreshingTests.title": "Refreshing Tests",
-    "python.command.python.stopRefreshingTests.title": "Stop Refreshing Tests",
     "python.command.testing.rerunFailedTests.title": "Rerun Failed Tests",
     "python.command.python.execSelectionInTerminal.title": "Run Selection/Line in Python Terminal",
     "python.command.python.execSelectionInDjangoShell.title": "Run Selection/Line in Django Shell",
diff --git a/package.nls.zh-cn.json b/package.nls.zh-cn.json
@@ -8,9 +8,6 @@
     "python.command.python.viewOutput.title": "显示输出",
     "python.command.python.viewLanguageServerOutput.title": "显示语言服务器输出",
     "python.command.python.configureTests.title": "配置单元测试",
-    "python.command.python.refreshTests.title": "刷新单元测试",
-    "python.command.python.refreshingTests.title": "正在刷新单元测试",
-    "python.command.python.stopRefreshingTests.title": "停止刷新单元测试",
     "python.command.testing.rerunFailedTests.title": "重新进行出错的单元测试",
     "python.command.python.execSelectionInTerminal.title": "在 Python 终端中运行选定内容/行",
     "python.command.python.execSelectionInDjangoShell.title": "在 Django Shell 中运行选定内容/行",
diff --git a/src/client/common/application/commands.ts b/src/client/common/application/commands.ts
@@ -94,9 +94,6 @@ export interface ICommandNameArgumentTypeMapping extends ICommandNameWithoutArgu
     [Commands.Exec_In_Terminal_Icon]: [undefined, Uri];
     [Commands.Debug_In_Terminal]: [Uri];
     [Commands.Tests_Configure]: [undefined, undefined | CommandSource, undefined | Uri];
-    [Commands.Test_Refresh]: [undefined, undefined | CommandSource, undefined | Uri];
-    [Commands.Test_Refreshing]: [];
-    [Commands.Test_Stop_Refreshing]: [];
     [Commands.LaunchTensorBoard]: [TensorBoardEntrypoint, TensorBoardEntrypointTrigger];
     ['workbench.view.testing.focus']: [];
 }
diff --git a/src/client/common/constants.ts b/src/client/common/constants.ts
@@ -41,10 +41,6 @@ export namespace Commands {
     export const Exec_Selection_In_Terminal = 'python.execSelectionInTerminal';
     export const Exec_Selection_In_Django_Shell = 'python.execSelectionInDjangoShell';
     export const Tests_Configure = 'python.configureTests';
-    export const Test_Refresh = 'python.refreshTests';
-    // `python.refreshingTests` is a dummy command just to show the spinning icon
-    export const Test_Refreshing = 'python.refreshingTests';
-    export const Test_Stop_Refreshing = 'python.stopRefreshingTests';
     export const Sort_Imports = 'python.sortImports';
     export const ViewOutput = 'python.viewOutput';
     export const Start_REPL = 'python.startREPL';
diff --git a/src/client/testing/main.ts b/src/client/testing/main.ts
@@ -164,29 +164,6 @@ export class UnitTestManagementService implements IExtensionActivationService {
                     this.testController?.refreshTestData(resource, { forceRefresh: true });
                 },
             ),
-            commandManager.registerCommand(
-                constants.Commands.Test_Refresh,
-                async (
-                    _,
-                    cmdSource: constants.CommandSource = constants.CommandSource.commandPalette,
-                    resource?: Uri,
-                ) => {
-                    traceVerbose('Testing: Manually triggered test refresh');
-                    sendTelemetryEvent(EventName.UNITTEST_DISCOVERY_TRIGGER, undefined, {
-                        trigger: cmdSource,
-                    });
-                    this.testController?.refreshTestData(resource, { forceRefresh: true });
-                },
-            ),
-            commandManager.registerCommand(constants.Commands.Test_Refreshing, () => {
-                // We don't do anything if this is clicked. This is just to show
-                // the spinning refresh icon.
-            }),
-            commandManager.registerCommand(constants.Commands.Test_Stop_Refreshing, () => {
-                traceVerbose('Testing: Stop refreshing clicked.');
-                sendTelemetryEvent(EventName.UNITTEST_DISCOVERING_STOP);
-                this.testController?.stopRefreshing();
-            }),
         );
     }
 
diff --git a/src/client/testing/testController/controller.ts b/src/client/testing/testController/controller.ts
@@ -18,6 +18,7 @@ import {
 } from 'vscode';
 import { IExtensionSingleActivationService } from '../../activation/types';
 import { IWorkspaceService } from '../../common/application/types';
+import * as constants from '../../common/constants';
 import { IPythonExecutionFactory } from '../../common/process/types';
 import { IConfigurationService, IDisposableRegistry, Resource } from '../../common/types';
 import { DelayedTrigger, IDelayedTrigger } from '../../common/utils/delayTrigger';
@@ -112,6 +113,21 @@ export class PythonTestController implements ITestController, IExtensionSingleAc
             ),
         );
         this.testController.resolveHandler = this.resolveChildren.bind(this);
+        this.testController.refreshHandler = (token: CancellationToken) => {
+            this.disposables.push(
+                token.onCancellationRequested(() => {
+                    traceVerbose('Testing: Stop refreshing triggered');
+                    sendTelemetryEvent(EventName.UNITTEST_DISCOVERING_STOP);
+                    this.stopRefreshing();
+                }),
+            );
+
+            traceVerbose('Testing: Manually triggered test refresh');
+            sendTelemetryEvent(EventName.UNITTEST_DISCOVERY_TRIGGER, undefined, {
+                trigger: constants.CommandSource.commandPalette,
+            });
+            return this.refreshTestData(undefined, { forceRefresh: true });
+        };
 
         this.pythonTestServer = new PythonTestServer(this.pythonExecFactory);
     }
