diff --git a/.github/test_plan.md b/.github/test_plan.md index d64ef246832b..f6df3b4d74f4 100644 --- a/.github/test_plan.md +++ b/.github/test_plan.md @@ -34,7 +34,7 @@ - [ ] Right-click - [ ] Command - [ ] `Shift+Enter` - + #### Terminal Sample file: ```python @@ -316,7 +316,7 @@ def test_failure(): - [ ] `Run Test` works - [ ] `Debug Test` works - [ ] A `Diagnostic` is shown in the problems pane for each failed/skipped test - - [ ] The `Diagnostic`s are organized according to the file the test was executed from (not neccesarily the file it was defined in) + - [ ] The `Diagnostic`s are organized according to the file the test was executed from (not necessarily the file it was defined in) - [ ] The appropriate `DiagnosticRelatedInformation` is shown for each `Diagnostic` - [ ] The `DiagnosticRelatedInformation` reflects the traceback for the test @@ -385,7 +385,7 @@ def test_failure(): 1. After manualTestFile.py has been run drop down the Variables section at the top of the Interactive Window 1. In the Variables list there should be an entry for all variables created. These variables might change as more is added to manualTestFile.py. 1. Check that variables have expected values. They will be truncated for longer items - 1. Sort the list ascending and descending by Type. Also sort the list ascending and descenting by Count. Values like (X, Y) use the first X value for Count sort ordering + 1. Sort the list ascending and descending by Type. Also sort the list ascending and descending by Count. Values like (X, Y) use the first X value for Count sort ordering 1. Check that list, Series, ndarray, and DataFrame types have a button to "Show variable in data viewer" on the right 1. In the Interactive Window input box add a new variable. Verify that it is added into the Variable Explorer - [ ] Verify Data Explorer @@ -404,11 +404,11 @@ def test_failure(): #### P1 Test Scenarios - [ ] Connect to a `remote` server 1. Open up a valid python command prompt that can run `jupyter notebook` (a default Anaconda prompt works well) - 1. Run `jupyter notebook` to start up a local Jupyter server - 1. In the command window that launched Jupyter look for the server / token name like so: http://localhost:8888/?token=bf9eae43641cd75015df9104f814b8763ef0e23ffc73720d + 1. Run `jupyter notebook` to start up a local Jupyter server + 1. In the command window that launched Jupyter look for the server / token name like so: http://localhost:8888/?token=bf9eae43641cd75015df9104f814b8763ef0e23ffc73720d 1. Run the command `Python: Select Jupyter server URI` then `Type in the URI to connect to a running jupyter server` 1. Input the server / token name here - 1. Now run the cells in the manualTestFile.py + 1. Now run the cells in the manualTestFile.py 1. Verify that you see the server name in the initial connection message 1. Verify the outputs of the cells - [ ] Interactive Window commands @@ -458,7 +458,7 @@ def test_failure(): 1. Also make sure you are set to locally launch Jupyter and not to connect to an existing URI 1. In addition to your main testing environment install a new python or miniconda install (conda won't work as it has Jupyter by default) 1. In VS code change the python interpreter to the new install - 1. Try `Run Cell` + 1. Try `Run Cell` 1. You should get a message that Jupyter was not found and that it is defaulting back to launch on the python instance that has Jupyter - [ ] LiveShare Support 1. Install the LiveShare VSCode Extension @@ -470,7 +470,7 @@ def test_failure(): 1. Open another window of VSCode 1. Connect the second instance of VSCode as a Guest to the first Live Share session 1. After the workspace opens, open the manualTestFile.py on the Guest instance - 1. On the Guest instance run a cell from the file, both via the codelens and via the command palette `Run Cell` command + 1. On the Guest instance run a cell from the file, both via the codelens and via the command palette `Run Cell` command - [ ] Verify results 1. Output should show up on the Guest Interactive Window 1. Same output should show up in the Host Interactive Window diff --git a/CHANGELOG.md b/CHANGELOG.md index 11fa70bba36a..8943aa947ac2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -305,7 +305,7 @@ part of! ### Fixes -1. Changes to identificaction of `shell` for the activation of environments in the terminal. +1. Changes to identification of `shell` for the activation of environments in the terminal. ([#5743](https://github.com/microsoft/vscode-python/issues/5743)) ## 2019.5.17517 (30 May 2019) @@ -767,7 +767,7 @@ part of! ### Fixes 1. Update ptvsd to [4.2.7](https://github.com/Microsoft/ptvsd/releases/tag/v4.2.7). - * Fix issues related to debugging Django templagtes. + * Fix issues related to debugging Django templates. 1. Update the Python language server to 0.2.47. ### Code Health @@ -782,7 +782,7 @@ part of! 1. Fix regression preventing the expansion of variables in the watch window and the debug console. ([#5035](https://github.com/Microsoft/vscode-python/issues/5035)) -1. Display survey banner (again) for Language Server when using current Lanaguage Server. +1. Display survey banner (again) for Language Server when using current Language Server. ([#5064](https://github.com/Microsoft/vscode-python/issues/5064)) 1. Update ptvsd to [4.2.6](https://github.com/Microsoft/ptvsd/releases/tag/v4.2.6). ([#5083](https://github.com/Microsoft/vscode-python/issues/5083)) @@ -890,7 +890,7 @@ part of! ([#4743](https://github.com/Microsoft/vscode-python/issues/4743)) 1. Perform case insensitive comparison of Python Environment paths ([#4797](https://github.com/Microsoft/vscode-python/issues/4797)) -1. Ensure `Jedi` uses the currently selected intepreter. +1. Ensure `Jedi` uses the currently selected interpreter. (thanks [Selim Belhaouane](https://github.com/selimb)) ([#4687](https://github.com/Microsoft/vscode-python/issues/4687)) 1. Multiline comments with text on the first line break Python Interactive window execution. @@ -1123,7 +1123,7 @@ part of! ([#4371](https://github.com/Microsoft/vscode-python/issues/4371)) 1. Update ptvsd to [4.2.4](https://github.com/Microsoft/ptvsd/releases/tag/v4.2.4). ([#4457](https://github.com/Microsoft/vscode-python/issues/4457)) - * Validate brekpoint targets. + * Validate breakpoint targets. * Properly exclude certain files from showing up in the debugger. ### Fixes @@ -1661,7 +1661,7 @@ part of! ### Code Health -1. Added basic integration tests for the new Lanaguage Server. +1. Added basic integration tests for the new Language Server. ([#2041](https://github.com/Microsoft/vscode-python/issues/2041)) 1. Add smoke tests for the extension. ([#3021](https://github.com/Microsoft/vscode-python/issues/3021)) @@ -1678,7 +1678,7 @@ part of! ([#3350](https://github.com/Microsoft/vscode-python/issues/3350)) 1. Stop running CI tests against the `master` branch of ptvsd. ([#3414](https://github.com/Microsoft/vscode-python/issues/3414)) -1. Be more aggresive in searching for a Python environment that can run Jupyter +1. Be more aggressive in searching for a Python environment that can run Jupyter (make sure to cleanup any kernelspecs that are created during this process). ([#3433](https://github.com/Microsoft/vscode-python/issues/3433)) @@ -2159,7 +2159,7 @@ part of! ([#2266](https://github.com/Microsoft/vscode-python/issues/2266)) 1. Deprecate command `Python: Build Workspace Symbols` when using the language server. ([#2267](https://github.com/Microsoft/vscode-python/issues/2267)) -1. Pin version of `pylint` to `3.6.3` to allow ensure `pylint` gets installed on Travis with Pytnon2.7. +1. Pin version of `pylint` to `3.6.3` to allow ensure `pylint` gets installed on Travis with Python2.7. ([#2305](https://github.com/Microsoft/vscode-python/issues/2305)) 1. Remove some of the debugger tests and fix some minor debugger issues. ([#2307](https://github.com/Microsoft/vscode-python/issues/2307)) @@ -2362,7 +2362,7 @@ part of! ([#1064](https://github.com/Microsoft/vscode-python/issues/1064)) 1. Improvements to the logic used to parse the arguments passed into the test frameworks. ([#1070](https://github.com/Microsoft/vscode-python/issues/1070)) -1. Ensure navigation to definitons follows imports and is transparent to decoration. +1. Ensure navigation to definitions follows imports and is transparent to decoration. (thanks [Peter Law](https://github.com/PeterJCLaw)) ([#1638](https://github.com/Microsoft/vscode-python/issues/1638)) 1. Fix for intellisense failing when using the new `Outline` feature. @@ -2505,7 +2505,7 @@ nearly as feature-rich and useful as it is. ([#452](https://github.com/Microsoft/vscode-python/issues/452)) 1. Ensure empty paths do not get added into `sys.path` by the Jedi language server. (this was fixed in the previous release in [#1471](https://github.com/Microsoft/vscode-python/pull/1471)) ([#677](https://github.com/Microsoft/vscode-python/issues/677)) -1. Resolves rename refactor issue that remvoes the last line of the source file when the line is being refactored and source does not end with an EOL. +1. Resolves rename refactor issue that removes the last line of the source file when the line is being refactored and source does not end with an EOL. ([#695](https://github.com/Microsoft/vscode-python/issues/695)) 1. Ensure the prompt to install missing packages is not displayed more than once. ([#980](https://github.com/Microsoft/vscode-python/issues/980)) @@ -2562,7 +2562,7 @@ nearly as feature-rich and useful as it is. ([#1794](https://github.com/Microsoft/vscode-python/issues/1794)) 1. Fix failing Prospector unit tests and add more tests for linters (with and without workspaces). ([#1836](https://github.com/Microsoft/vscode-python/issues/1836)) -1. Ensure `Outline` view doesn't overload the language server with too many requets, while user is editing text in the editor. +1. Ensure `Outline` view doesn't overload the language server with too many requests, while user is editing text in the editor. ([#1856](https://github.com/Microsoft/vscode-python/issues/1856)) @@ -2612,7 +2612,7 @@ his help on [our issue tracker](https://github.com/Microsoft/vscode-python)! ([#1395](https://github.com/Microsoft/vscode-python/issues/1395)) 1. Intergrate Jedi 0.12. See https://github.com/davidhalter/jedi/issues/1063#issuecomment-381417297 for details. ([#1400](https://github.com/Microsoft/vscode-python/issues/1400)) -1. Enable Jinja template debugging as a default behaivour when using the Watson debug configuration for debugging of Watson applications. +1. Enable Jinja template debugging as a default behaviour when using the Watson debug configuration for debugging of Watson applications. ([#1480](https://github.com/Microsoft/vscode-python/issues/1480)) 1. Enable Jinja template debugging as a default behavior when debugging Pyramid applications. ([#1492](https://github.com/Microsoft/vscode-python/issues/1492)) @@ -2624,7 +2624,7 @@ his help on [our issue tracker](https://github.com/Microsoft/vscode-python)! ``` Additional capabilities: * `ptvsd.break_into_debugger()` to break into the attached debugger. - * `ptvsd.wait_for_attach(timeout)` to cause the program to wait untill a debugger attaches. + * `ptvsd.wait_for_attach(timeout)` to cause the program to wait until a debugger attaches. * `ptvsd.is_attached()` to determine whether a debugger is attached to the program. ([#907](https://github.com/Microsoft/vscode-python/issues/907)) @@ -2638,7 +2638,7 @@ his help on [our issue tracker](https://github.com/Microsoft/vscode-python)! ([#1072](https://github.com/Microsoft/vscode-python/issues/1072)) 1. Reverted change that ended up considering symlinked interpreters as duplicate interpreter. ([#1192](https://github.com/Microsoft/vscode-python/issues/1192)) -1. Display errors returned by the PipEnv command when identifying the corresonding environment. +1. Display errors returned by the PipEnv command when identifying the corresponding environment. ([#1254](https://github.com/Microsoft/vscode-python/issues/1254)) 1. When `editor.formatOnType` is on, don't add a space for `*args` or `**kwargs` ([#1257](https://github.com/Microsoft/vscode-python/issues/1257)) @@ -2737,9 +2737,9 @@ his help on [our issue tracker](https://github.com/Microsoft/vscode-python)! ([#526](https://github.com/Microsoft/vscode-python/issues/526)) 1. Disable the display of errors messages when rediscovering of tests fail in response to changes to files, e.g. don't show a message if there's a syntax error in the test code. ([#704](https://github.com/Microsoft/vscode-python/issues/704)) -1. Bundle python depedencies (PTVSD package) in the extension for the experimental debugger. +1. Bundle python dependencies (PTVSD package) in the extension for the experimental debugger. ([#741](https://github.com/Microsoft/vscode-python/issues/741)) -1. Add support for expermental debugger when debugging Python Unit Tests. +1. Add support for experimental debugger when debugging Python Unit Tests. ([#906](https://github.com/Microsoft/vscode-python/issues/906)) 1. Support `Debug Console` as a `console` option for the Experimental Debugger. ([#950](https://github.com/Microsoft/vscode-python/issues/950)) @@ -3107,10 +3107,10 @@ the following people who contributed code: * Provide a warning about known issues with having pyenv.cfg whilst debugging [#913](https://github.com/DonJayamanne/pythonVSCode/issues/913) * Create .vscode directory if not found [#1043](https://github.com/DonJayamanne/pythonVSCode/issues/1043) * Highlighted text due to linter errors is off by one column [#965](https://github.com/DonJayamanne/pythonVSCode/issues/965), [#970](https://github.com/DonJayamanne/pythonVSCode/pull/970) -* Added preminary support for WSL Bash and Cygwin [#1049](https://github.com/DonJayamanne/pythonVSCode/pull/1049) +* Added preliminary support for WSL Bash and Cygwin [#1049](https://github.com/DonJayamanne/pythonVSCode/pull/1049) * Ability to configure the linter severity levels [#941](https://github.com/DonJayamanne/pythonVSCode/pull/941), [#895](https://github.com/DonJayamanne/pythonVSCode/issues/895) * Fixes to unit tests [#1051](https://github.com/DonJayamanne/pythonVSCode/pull/1051), [#1050](https://github.com/DonJayamanne/pythonVSCode/pull/1050) -* Outdent lines following `contibue`, `break` and `return` [#1050](https://github.com/DonJayamanne/pythonVSCode/pull/1050) +* Outdent lines following `continue`, `break` and `return` [#1050](https://github.com/DonJayamanne/pythonVSCode/pull/1050) * Change location of cache for Jedi files [#1035](https://github.com/DonJayamanne/pythonVSCode/pull/1035) * Fixes to the way directories are searched for Python interpreters [#569](https://github.com/DonJayamanne/pythonVSCode/issues/569), [#1040](https://github.com/DonJayamanne/pythonVSCode/pull/1040) * Handle outputs from Python packages that interfere with the way autocompletion is handled [#602](https://github.com/DonJayamanne/pythonVSCode/issues/602) @@ -3208,7 +3208,7 @@ the following people who contributed code: * Adding support for debug snippets [#660](https://github.com/DonJayamanne/pythonVSCode/issues/660) * Ability to run a selected text in a Django shell [#652](https://github.com/DonJayamanne/pythonVSCode/issues/652) * Adding support for the use of a customized 'isort' for sorting of imports [#632](https://github.com/DonJayamanne/pythonVSCode/pull/632) -* Debuger auto-detecting python interpreter from the path provided [#688](https://github.com/DonJayamanne/pythonVSCode/issues/688) +* Debugger auto-detecting python interpreter from the path provided [#688](https://github.com/DonJayamanne/pythonVSCode/issues/688) * Showing symbol type on hover [#657](https://github.com/DonJayamanne/pythonVSCode/pull/657) * Fixes to running Python file when terminal uses Powershell [#651](https://github.com/DonJayamanne/pythonVSCode/issues/651) * Fixes to linter issues when displaying Git diff view for Python files [#665](https://github.com/DonJayamanne/pythonVSCode/issues/665) @@ -3278,7 +3278,7 @@ the following people who contributed code: * Linting python files when they are opened [#462](https://github.com/DonJayamanne/pythonVSCode/issues/462) * Fixes to unit tests discovery [#307](https://github.com/DonJayamanne/pythonVSCode/issues/307), [#459](https://github.com/DonJayamanne/pythonVSCode/issues/459) -* Fixes to intelliense [#438](https://github.com/DonJayamanne/pythonVSCode/issues/438), +* Fixes to intellisense [#438](https://github.com/DonJayamanne/pythonVSCode/issues/438), [#433](https://github.com/DonJayamanne/pythonVSCode/issues/433), [#457](https://github.com/DonJayamanne/pythonVSCode/issues/457), [#436](https://github.com/DonJayamanne/pythonVSCode/issues/436), @@ -3366,7 +3366,7 @@ the following people who contributed code: * Displaying errors in variable explorer when debugging [#271](https://github.com/DonJayamanne/pythonVSCode/issues/271) * Ability to debug applications as sudo [#224](https://github.com/DonJayamanne/pythonVSCode/issues/224) * Fixed debugger crashes [#263](https://github.com/DonJayamanne/pythonVSCode/issues/263) -* Asynchronour display of unit tests [#190](https://github.com/DonJayamanne/pythonVSCode/issues/190) +* Asynchronous display of unit tests [#190](https://github.com/DonJayamanne/pythonVSCode/issues/190) * Fixed issues when using relative paths in ```settings.json``` [#276](https://github.com/DonJayamanne/pythonVSCode/issues/276) * Fixes issue of hardcoding interpreter command arguments [#256](https://github.com/DonJayamanne/pythonVSCode/issues/256) * Fixes resolving of remote paths when debugging remote applications [#252](https://github.com/DonJayamanne/pythonVSCode/issues/252) @@ -3473,7 +3473,7 @@ the following people who contributed code: * Added support to configure the output window for linting, formatting and unit test messages [#112](https://github.com/DonJayamanne/pythonVSCode/issues/112) ## Version 0.3.5 -* Fixed printing of unicode characters when evaulating expressions [#73](https://github.com/DonJayamanne/pythonVSCode/issues/73) +* Fixed printing of unicode characters when evaluating expressions [#73](https://github.com/DonJayamanne/pythonVSCode/issues/73) ## Version 0.3.4 * Updated snippets diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 269ea4333307..c80391626648 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -282,4 +282,4 @@ The development build of the extension: * Does not get updated with new development builds of the extension (if you want to test a newer development build, uninstall the old version of the extension and then install the new version) -* Is built everytime a PR is commited into the [`master` branch](https://github.com/Microsoft/vscode-python). +* Is built every time a PR is committed into the [`master` branch](https://github.com/Microsoft/vscode-python). diff --git a/build/ci/templates/build_compile_steps.yml b/build/ci/templates/build_compile_steps.yml index c0ac5b5d2d01..2aeeb8d352ef 100644 --- a/build/ci/templates/build_compile_steps.yml +++ b/build/ci/templates/build_compile_steps.yml @@ -99,5 +99,5 @@ steps: inputs: pathtoPublish: $(Build.ArtifactStagingDirectory) artifactName: VSIX - displayName: "Publish VSIX to Arifacts" + displayName: "Publish VSIX to Artifacts" condition: and(succeeded(), eq(variables['build'], 'true')) diff --git a/build/ci/templates/merge_upload_coverage.yml b/build/ci/templates/merge_upload_coverage.yml index 539cc3b561d2..30da92df6d39 100644 --- a/build/ci/templates/merge_upload_coverage.yml +++ b/build/ci/templates/merge_upload_coverage.yml @@ -33,12 +33,12 @@ steps: displayName: "Restore Coverage Info" condition: always() - # Now that we have downloaded artificats from `coverage-output-`, copy them + # Now that we have downloaded artifacts from `coverage-output-`, copy them # into the root directory (they'll go under `.nyc_output/...`) # These are the coverage output files that can be merged and then we can generate a report from them. # This step results in downloading all individual `./nyc_output` results in coverage - # from all different test outputs. - # Running the process of generating reports, will result in generation of + # from all different test outputs. + # Running the process of generating reports, will result in generation of # reports from all coverage data, i.e. we're basically combining all to generate a single merged report. - bash: | cp -r coverage-output-*/ ./ diff --git a/build/ci/templates/test_phases.yml b/build/ci/templates/test_phases.yml index bafbbe8ff0b7..f7edee7583e9 100644 --- a/build/ci/templates/test_phases.yml +++ b/build/ci/templates/test_phases.yml @@ -25,7 +25,7 @@ # 'testMultiWorkspace' # 'testDebugger' # 'testFunctional' -# 'perfomanceTests' +# 'testPerformance' # 'venvTests' steps: @@ -385,7 +385,7 @@ steps: # Run the virtual environment based tests. # This set of tests is simply using the `testSingleWorkspace` set of tests, but # with the environment variable `TEST_FILES_SUFFIX` set to `testvirtualenvs`, which - # got set in the Prepare Venv-Test Environmant task above. + # got set in the Prepare Venv-Test Environment task above. # **Note**: Azure DevOps tasks set environment variables via a specially formatted # string sent to stdout. # diff --git a/build/ci/templates/uitest_phases.yml b/build/ci/templates/uitest_phases.yml index 6099c94da19a..651484175c69 100644 --- a/build/ci/templates/uitest_phases.yml +++ b/build/ci/templates/uitest_phases.yml @@ -2,7 +2,7 @@ # Overview: # ----------------------------------------------------------------------------------------------------------------------------- # Steps to be executed as part of the UI tests. -# 1. Show all env vars - Logging (display environment variabels). +# 1. Show all env vars - Logging (display environment variables). # 2. Use Node - Specify and use node version. # 3. Setup Python ? for extension - Version of Python to be used for testing in Extension. # 4. Setup CI_PYTHON_PATH for extension - Export Env variable that'll be used by a seprate step. @@ -12,10 +12,10 @@ # 7. npm ci - Install npm packages for some JS scripts used in testing (NOT for extension). # 8. Show Dependency Versions - Logging. # 9. Start xvfb - Start in-memory display server (for launching VSC). -# 10. Restore VSIX - VSIX has been built in another Job, download that from artificats. +# 10. Restore VSIX - VSIX has been built in another Job, download that from artifacts. # 11. Copy VSIX - Copy the VSIX into root directory (test suite expects it to be in root - default setup). # 12. Setup pyperclicp dependency - We use pyperclip to copy text into clipboard buffer (see where this is used in code for info). -# 13. Download & install UI Test dependencies - Download & Install everything requried for the UI tests. +# 13. Download & install UI Test dependencies - Download & Install everything required for the UI tests. # 14. Run Tests - Launch the UI tests in Python # 15. Copy Reports # 16. Copy Screenshots diff --git a/build/ci/vscode-python-nightly-uitest.yaml b/build/ci/vscode-python-nightly-uitest.yaml index 570a842e9586..336beaff3fef 100644 --- a/build/ci/vscode-python-nightly-uitest.yaml +++ b/build/ci/vscode-python-nightly-uitest.yaml @@ -34,7 +34,7 @@ jobs: tags: "--tags=@testing" # We have python code that is involved in running/discovering tests. # Hence test against all versions, until we have CI running for the Python code. - # I.e. when all test dicovery/running is done purely in Python. + # I.e. when all test discovery/running is done purely in Python. - test: "Terminal" tags: "--tags=@terminal --tags=~@terminal.pipenv" # No need to run tests against all versions. diff --git a/gulpfile.js b/gulpfile.js index 7c6b1d7fc18a..7dd7b7e9016e 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -103,7 +103,7 @@ gulp.task('clean', gulp.parallel('output:clean', 'clean:vsix', 'clean:out')); gulp.task('checkNativeDependencies', done => { if (hasNativeDependencies()) { - done(new Error('Native dependencies deteced')); + done(new Error('Native dependencies detected')); } done(); }); diff --git a/pythonFiles/normalizeForInterpreter.py b/pythonFiles/normalizeForInterpreter.py index 9fd4991c7407..80eac0ca299d 100644 --- a/pythonFiles/normalizeForInterpreter.py +++ b/pythonFiles/normalizeForInterpreter.py @@ -106,7 +106,7 @@ def normalize_lines(source): del lines[line_number-1] # Step 2: Add blank lines between each global statement block. - # A consequtive single lines blocks of code will be treated as a single statement, + # A consecutive single lines blocks of code will be treated as a single statement, # just to ensure we do not unnecessarily add too many blank lines. source = '\n'.join(lines) tokens = _tokenize(source) diff --git a/pythonFiles/testing_tools/adapter/pytest/_pytest_item.py b/pythonFiles/testing_tools/adapter/pytest/_pytest_item.py index 92b48e820d4e..aca4abe13b12 100644 --- a/pythonFiles/testing_tools/adapter/pytest/_pytest_item.py +++ b/pythonFiles/testing_tools/adapter/pytest/_pytest_item.py @@ -13,7 +13,7 @@ Collectors and items are collectively identified as "nodes". The pytest API relies on collector and item objects providing specific methods and attributes. In addition to corresponding base classes, pytest provides -a number of concrete impementations. +a number of concrete implementations. The following are the known pytest node types: diff --git a/src/client/debugger/debugAdapter/main.ts b/src/client/debugger/debugAdapter/main.ts index 7bf56a430a3c..6781d36a3b24 100644 --- a/src/client/debugger/debugAdapter/main.ts +++ b/src/client/debugger/debugAdapter/main.ts @@ -462,20 +462,20 @@ class DebugManager implements Disposable { } // When VS Code sends a disconnect request, PTVSD replies back with a response. - // Wait for sometime, untill the messages are sent out (remember, we're just intercepting streams here). + // Wait for sometime, until the messages are sent out (remember, we're just intercepting streams here). setTimeout(this.shutdown, 500); } private onEventTerminated = async () => { logger.verbose('onEventTerminated'); this.terminatedEventSent = true; - // Wait for sometime, untill the messages are sent out (remember, we're just intercepting streams here). + // Wait for sometime, until the messages are sent out (remember, we're just intercepting streams here). setTimeout(this.shutdown, 300); } private onResponseDisconnect = async () => { this.disconnectResponseSent = true; logger.verbose('onResponseDisconnect'); // When VS Code sends a disconnect request, PTVSD replies back with a response, but its upto us to kill the process. - // Wait for sometime, untill the messages are sent out (remember, we're just intercepting streams here). + // Wait for sometime, until the messages are sent out (remember, we're just intercepting streams here). // Also its possible PTVSD might run to completion. setTimeout(this.shutdown, 100); } diff --git a/src/client/interpreter/locators/services/workspaceVirtualEnvWatcherService.ts b/src/client/interpreter/locators/services/workspaceVirtualEnvWatcherService.ts index b8de265fd39c..8350b0b809c4 100644 --- a/src/client/interpreter/locators/services/workspaceVirtualEnvWatcherService.ts +++ b/src/client/interpreter/locators/services/workspaceVirtualEnvWatcherService.ts @@ -38,7 +38,7 @@ export class WorkspaceVirtualEnvWatcherService implements IInterpreterWatcher, D public dispose() { this.clearTimers(); } - @traceDecorators.verbose('Register Intepreter Watcher') + @traceDecorators.verbose('Register Interpreter Watcher') public async register(resource: Resource): Promise { if (this.fsWatchers.length > 0) { return; @@ -59,7 +59,7 @@ export class WorkspaceVirtualEnvWatcherService implements IInterpreterWatcher, D this.fsWatchers.push(fsWatcher); } } - @traceDecorators.verbose('Intepreter Watcher change handler') + @traceDecorators.verbose('Interpreter Watcher change handler') public async createHandler(e: Uri) { this.didCreate.fire(this.resource); // On Windows, creation of environments are very slow, hence lets notify again after diff --git a/src/client/jupyter/provider.ts b/src/client/jupyter/provider.ts index 8cf46b12f253..e2408b1a78b3 100644 --- a/src/client/jupyter/provider.ts +++ b/src/client/jupyter/provider.ts @@ -32,7 +32,7 @@ export class JupyterProvider { return Promise.resolve(selectedCode); } - // ok we're in a block, look for the end of the block untill the last line in the cell (if there are any cells) + // ok we're in a block, look for the end of the block until the last line in the cell (if there are any cells) return new Promise((resolve, _reject) => { const activeEditor = window.activeTextEditor; if (!activeEditor) { @@ -50,7 +50,7 @@ export class JupyterProvider { continue; } if (nextLineIndent === startIndent) { - // Return code untill previous line + // Return code until previous line const endRange = activeEditor.document.lineAt(lineNumber - 1).range.end; resolve(activeEditor.document.getText(new Range(activeEditor.selection.start, endRange))); } diff --git a/src/client/telemetry/index.ts b/src/client/telemetry/index.ts index dbe6be6a46a9..9677bda490c1 100644 --- a/src/client/telemetry/index.ts +++ b/src/client/telemetry/index.ts @@ -105,7 +105,7 @@ export function sendTelemetryEvent

{ server.start(uri, options).ignoreErrors(); // Even though server has started request should not yet be sent out. - // Not untill language client has initialized. + // Not until language client has initialized. expect(() => server.loadExtension(loadExtensionArgs)).not.throw(); client.verify(c => c.sendRequest(typemoq.It.isAny(), typemoq.It.isAny()), typemoq.Times.never()); @@ -148,7 +148,7 @@ suite('Language Server - LanguageServer', () => { const promise = server.start(uri, options); // Even though server has started request should not yet be sent out. - // Not untill language client has initialized. + // Not until language client has initialized. expect(() => server.loadExtension(loadExtensionArgs)).not.throw(); client.verify(c => c.sendRequest(typemoq.It.isAny(), typemoq.It.isAny()), typemoq.Times.never()); diff --git a/src/test/common/platform/filesystem.unit.test.ts b/src/test/common/platform/filesystem.unit.test.ts index 04fd6f62a01a..2e65335b057f 100644 --- a/src/test/common/platform/filesystem.unit.test.ts +++ b/src/test/common/platform/filesystem.unit.test.ts @@ -102,7 +102,7 @@ suite('FileSystem', () => { expect(err).to.equal(undefined, `Failed to write to a temp file, error is ${err}`); }); }, (failReason) => { - expect(failReason).to.equal('No errors occured', `Failed to create a temporary file with error ${failReason}`); + expect(failReason).to.equal('No errors occurred', `Failed to create a temporary file with error ${failReason}`); }); }); test('Ensure chmod works against a temporary file', async () => { diff --git a/src/test/datascience/execution.unit.test.ts b/src/test/datascience/execution.unit.test.ts index 47d7a5fe8737..3939ecb16437 100644 --- a/src/test/datascience/execution.unit.test.ts +++ b/src/test/datascience/execution.unit.test.ts @@ -604,7 +604,7 @@ suite('Jupyter Execution', async () => { await assert.eventually.equal(execution.isKernelSpecSupported(), true, 'Kernel Spec not supported'); await assert.eventually.equal(execution.isKernelCreateSupported(), true, 'Kernel Create not supported'); const usableInterpreter = await execution.getUsableJupyterPython(); - assert.isOk(usableInterpreter, 'Usable intepreter not found'); + assert.isOk(usableInterpreter, 'Usable interpreter not found'); await assert.isFulfilled(execution.connectToNotebookServer(), 'Should be able to start a server'); }).timeout(10000); @@ -632,7 +632,7 @@ suite('Jupyter Execution', async () => { await assert.eventually.equal(execution.isKernelSpecSupported(), true, 'Kernel Spec not supported'); await assert.eventually.equal(execution.isKernelCreateSupported(), true, 'Kernel Create not supported'); const usableInterpreter = await execution.getUsableJupyterPython(); - assert.isOk(usableInterpreter, 'Usable intepreter not found'); + assert.isOk(usableInterpreter, 'Usable interpreter not found'); if (usableInterpreter) { assert.notEqual(usableInterpreter.path, missingNotebookPython.path); } @@ -643,7 +643,7 @@ suite('Jupyter Execution', async () => { when(interpreterService.getActiveInterpreter()).thenResolve(missingKernelPython); await assert.eventually.equal(execution.isNotebookSupported(), true, 'Notebook not supported'); const usableInterpreter = await execution.getUsableJupyterPython(); - assert.isOk(usableInterpreter, 'Usable intepreter not found'); + assert.isOk(usableInterpreter, 'Usable interpreter not found'); if (usableInterpreter) { // Linter assert.equal(usableInterpreter.path, missingKernelPython.path); assert.equal(usableInterpreter.version!.major, missingKernelPython.version!.major, 'Found interpreter should match on major'); @@ -656,7 +656,7 @@ suite('Jupyter Execution', async () => { when(interpreterService.getActiveInterpreter()).thenResolve(missingNotebookPython); await assert.eventually.equal(execution.isNotebookSupported(), true, 'Notebook not supported'); const usableInterpreter = await execution.getUsableJupyterPython(); - assert.isOk(usableInterpreter, 'Usable intepreter not found'); + assert.isOk(usableInterpreter, 'Usable interpreter not found'); if (usableInterpreter) { // Linter assert.notEqual(usableInterpreter.path, missingNotebookPython.path); assert.notEqual(usableInterpreter.version!.major, missingNotebookPython.version!.major, 'Found interpreter should not match on major'); diff --git a/src/test/debugger/common/protocoloLogger.test.ts b/src/test/debugger/common/protocoloLogger.test.ts index c82cfbe84e22..dde6bc79abd0 100644 --- a/src/test/debugger/common/protocoloLogger.test.ts +++ b/src/test/debugger/common/protocoloLogger.test.ts @@ -13,7 +13,7 @@ suite('Debugging - Protocol Logger', () => { setup(() => { protocolLogger = new ProtocolLogger(); }); - test('Ensure messages are buffered untill logger is provided', async () => { + test('Ensure messages are buffered until logger is provided', async () => { const inputStream = new PassThrough(); const outputStream = new PassThrough(); diff --git a/src/test/initialize.ts b/src/test/initialize.ts index a3a2e843b4be..9f725a4e7ae1 100644 --- a/src/test/initialize.ts +++ b/src/test/initialize.ts @@ -40,7 +40,7 @@ export async function initialize(): Promise { export async function activateExtension() { const extension = vscode.extensions.getExtension(PVSC_EXTENSION_ID_FOR_TESTS)!; const api = await extension.activate(); - // Wait untill its ready to use. + // Wait until its ready to use. await api.ready; return api; } diff --git a/src/test/interpreters/autoSelection/rules/workspaceEnv.unit.test.ts b/src/test/interpreters/autoSelection/rules/workspaceEnv.unit.test.ts index 76edd0284207..8fdaf830209d 100644 --- a/src/test/interpreters/autoSelection/rules/workspaceEnv.unit.test.ts +++ b/src/test/interpreters/autoSelection/rules/workspaceEnv.unit.test.ts @@ -147,12 +147,12 @@ suite('Interpreters - Auto Selection - Workspace Virtual Envs Rule', () => { verify(helper.getActiveWorkspaceUri(anything())).once(); pythonPathInConfig.verifyAll(); }); - test('Does not udpate settings when there is no interpreter', async () => { + test('Does not update settings when there is no interpreter', async () => { await rule.cacheSelectedInterpreter(undefined, {} as any); verify(pythonPathUpdaterService.updatePythonPath(anything(), anything(), anything(), anything())).never(); }); - test('Does not udpate settings when there is not workspace', async () => { + test('Does not update settings when there is not workspace', async () => { const resource = Uri.file('x'); when(helper.getActiveWorkspaceUri(resource)).thenReturn(undefined); diff --git a/src/test/languageServers/jedi/definitions/hover.jedi.test.ts b/src/test/languageServers/jedi/definitions/hover.jedi.test.ts index f5ff09aff682..8a325dec9cfa 100644 --- a/src/test/languageServers/jedi/definitions/hover.jedi.test.ts +++ b/src/test/languageServers/jedi/definitions/hover.jedi.test.ts @@ -63,7 +63,7 @@ suite('Hover Definition (Jedi)', () => { assert.equal(`${def[0].range!.start.line},${def[0].range!.start.character}`, '1,9', 'Start position is incorrect'); assert.equal(`${def[0].range!.end.line},${def[0].range!.end.character}`, '1,12', 'End position is incorrect'); // tslint:disable-next-line:prefer-template - assert.equal(normalizeMarkedString(def[0].contents[0]), '```python' + EOL + 'def fun()' + EOL + '```' + EOL + 'This is fun', 'Invalid conents'); + assert.equal(normalizeMarkedString(def[0].contents[0]), '```python' + EOL + 'def fun()' + EOL + '```' + EOL + 'This is fun', 'Invalid contents'); }).then(done, done); }); @@ -84,7 +84,7 @@ suite('Hover Definition (Jedi)', () => { // tslint:disable-next-line:prefer-template assert.equal(normalizeMarkedString(def[0].contents[0]), '```python' + EOL + 'def bar()' + EOL + '```' + EOL + '说明 - keep this line, it works' + EOL + 'delete following line, it works' + - EOL + '如果存在需要等待审批或正在执行的任务，将不刷新页面', 'Invalid conents'); + EOL + '如果存在需要等待审批或正在执行的任务，将不刷新页面', 'Invalid contents'); }).then(done, done); }); @@ -107,7 +107,7 @@ suite('Hover Definition (Jedi)', () => { 'def showMessage()' + EOL + '```' + EOL + 'Кюм ут жэмпэр пошжим льаборэж, коммюны янтэрэсщэт нам ед, декта игнота ныморэ жят эи. ' + EOL + - 'Шэа декам экшырки эи, эи зыд эррэм докэндё, векж факэтэ пэрчыквюэрёж ку.', 'Invalid conents'); + 'Шэа декам экшырки эи, эи зыд эррэм докэндё, векж факэтэ пэрчыквюэрёж ку.', 'Invalid contents'); }).then(done, done); }); @@ -168,7 +168,7 @@ suite('Hover Definition (Jedi)', () => { 'Optionally, implement a getrandbits() method so that randrange()' + EOL + 'can cover arbitrarily large ranges.'; - assert.equal(normalizeMarkedString(def[0].contents[0]), documentation, 'Invalid conents'); + assert.equal(normalizeMarkedString(def[0].contents[0]), documentation, 'Invalid contents'); }).then(done, done); }); @@ -190,7 +190,7 @@ suite('Hover Definition (Jedi)', () => { assert.equal(normalizeMarkedString(def[0].contents[0]), '```python' + EOL + 'def randint(a, b)' + EOL + '```' + EOL + - 'Return random integer in range [a, b], including both end points.', 'Invalid conents'); + 'Return random integer in range [a, b], including both end points.', 'Invalid contents'); }).then(done, done); }); @@ -212,7 +212,7 @@ suite('Hover Definition (Jedi)', () => { assert.equal(normalizeMarkedString(def[0].contents[0]), '```python' + EOL + 'def acos(x)' + EOL + '```' + EOL + - 'Return the arc cosine (measured in radians) of x.', 'Invalid conents'); + 'Return the arc cosine (measured in radians) of x.', 'Invalid contents'); }).then(done, done); }); diff --git a/src/test/mocks/vsc/README.md b/src/test/mocks/vsc/README.md index 39fbe1508bbd..3413cbd810be 100644 --- a/src/test/mocks/vsc/README.md +++ b/src/test/mocks/vsc/README.md @@ -2,5 +2,5 @@ * These classes are only used when running unit tests that are not hosted by VS Code. * So even if these classes were buggy, it doesn't matter, running the tests under VS Code host will ensure the right classes are available. * The purpose of these classes are to avoid having to use VS Code as the hosting environment for the tests, making it faster to run the tests and not have to rely on VS Code host to run the tests. -* Everyting in here must either be within a namespace prefixed with `vscMock` or exported types must be prefixed with `vscMock`. +* Everything in here must either be within a namespace prefixed with `vscMock` or exported types must be prefixed with `vscMock`. This is to prevent developers from accidentally importing them into their Code. Even if they did, the extension would fail to load and tests would fail. diff --git a/src/test/pythonFiles/folding/visualstudio_py_repl.py b/src/test/pythonFiles/folding/visualstudio_py_repl.py index 9c5127d66537..595922f8f9cc 100644 --- a/src/test/pythonFiles/folding/visualstudio_py_repl.py +++ b/src/test/pythonFiles/folding/visualstudio_py_repl.py @@ -213,7 +213,7 @@ def _repl_loop(self): except timeout_exc_types: r, w, x = select.select([], [], [self.conn], 0) if x: - # an exception event has occured on the socket... + # an exception event has occurred on the socket... raise continue diff --git a/src/test/pythonFiles/refactoring/standAlone/refactor.py b/src/test/pythonFiles/refactoring/standAlone/refactor.py index be825150a841..ee941dd45ebf 100644 --- a/src/test/pythonFiles/refactoring/standAlone/refactor.py +++ b/src/test/pythonFiles/refactoring/standAlone/refactor.py @@ -167,7 +167,7 @@ def __init__(self): def _extractVariable(self, filePath, start, end, newName): """ - Extracts a variale + Extracts a variable """ project = rope.base.project.Project(WORKSPACE_ROOT, ropefolder=ROPE_PROJECT_FOLDER, save_history=False) resourceToRefactor = libutils.path_to_resource(project, filePath) diff --git a/src/test/testing/argsService.test.ts b/src/test/testing/argsService.test.ts index 84cc4e7be4f0..c641d7da3118 100644 --- a/src/test/testing/argsService.test.ts +++ b/src/test/testing/argsService.test.ts @@ -147,7 +147,7 @@ function getOptions(product: Product, moduleName: string, withValues: boolean) { return getOptionsWithoutArguments(output) .concat(...knownOptionsWithoutArgs) .filter(item => knownOptionsWithArgs.indexOf(item) === -1) - // In pytest, any option begining with --log- is known to have args. + // In pytest, any option beginning with --log- is known to have args. .filter(item => product === Product.pytest ? !item.startsWith('--log-') : true) .sort(); } diff --git a/uitests/README.md b/uitests/README.md index d96e2e899fbe..d39f5d972783 100644 --- a/uitests/README.md +++ b/uitests/README.md @@ -48,7 +48,7 @@ Here are the steps involved in running the tests: - Each [feature](https://docs.cucumber.io/gherkin/reference/#feature) can have its own set of files in the form of a github repo. - Just add a tag with the path of the github repo url to the `feature`. - When starting the tests for a feature, the repo is downloaded into a new random directory `.vscode test/temp/workspace folder xyz` - - At the begining of every scenario, we repeate the previous step. + - At the beginning of every scenario, we repeate the previous step. - This ensures each scenario starts with a clean workspace folder. * Reports - Test results are stored in the `reports` directory @@ -92,7 +92,7 @@ Here are the steps involved in running the tests: - Using a `cucumber json` report format allows us to use existing tools to generate other HTML reports out of the raw `json` files. * Sending keyboard commands to VSC (such as `ctrl+p`) is currently not possible (**not known how to**). - `Selenium driver` can only send keyboard commands to a specific `html element`. - - But kyeboard commands such as `ctrl+p` are to be sent to the main window, and this isn't possible/not known. + - But keyboard commands such as `ctrl+p` are to be sent to the main window, and this isn't possible/not known. - Solution: We need to find the `html element` in VSC that will accept keys such as `ctrl+p` and the like. - Fortunately almost everything in VSC can be driven through commands in the `command palette`. - Hence, we have an extension that opens the `command palette`, from there, we use `selenium driver` to select commands. @@ -121,7 +121,7 @@ Here are the steps involved in running the tests: - `uitests/tests/steps` Location where all `BDD steps` are defined. - `uitests/tests/js` Location with helper `js` files (download chrome driver and generate html reports). - `uitests/tests/vscode` Contains all modules related to `vscode` (driving the UI, downloading, starting, etc). -- `environment.py` `enviroyment` file for `Behave`. +- `environment.py` `environment` file for `Behave`. ## CI Integration diff --git a/uitests/uitests/bootstrap/README.md b/uitests/uitests/bootstrap/README.md index 49c6cb511e9b..83c6139bc7e6 100644 --- a/uitests/uitests/bootstrap/README.md +++ b/uitests/uitests/bootstrap/README.md @@ -6,4 +6,4 @@ * Look for a file that contains the path to the workspace folder that needs to be opened. * Next use VSC API to re-load VSC by opening that folder. -* Hacky, but it works, at least untill we know how to pass CLI args when using `selenium` +* Hacky, but it works, at least until we know how to pass CLI args when using `selenium` diff --git a/uitests/uitests/bootstrap/extension/extension.js b/uitests/uitests/bootstrap/extension/extension.js index 786301203d1e..0bcd32e4235a 100644 --- a/uitests/uitests/bootstrap/extension/extension.js +++ b/uitests/uitests/bootstrap/extension/extension.js @@ -23,7 +23,7 @@ function activate(context) { context.subscriptions.push(statusBarItem); // Always display editor line, column in this statusbar. - // Sometimes we cannot detect the line,column of editor (because that item in statubar is not visbible due to lack of realestate). + // Sometimes we cannot detect the line,column of editor (because that item in statubar is not visible due to lack of realestate). // This will get around that problem. vscode.window.onDidChangeTextEditorSelection(e => { try { @@ -74,7 +74,7 @@ function activate(context) { (setting.type === 'workspace' ? vscode.ConfigurationTarget.Workspace : vscode.ConfigurationTarget.WorkspaceFolder); if (configTarget === vscode.ConfigurationTarget.WorkspaceFolder && !setting.workspaceFolder) { - vscode.window.showErrorMessage('Workspace Folder not defined for udpate/remove of settings'); + vscode.window.showErrorMessage('Workspace Folder not defined for update/remove of settings'); throw new Error('Workspace Folder not defined'); } diff --git a/uitests/uitests/environment.py b/uitests/uitests/environment.py index 3e57a4c0bc2b..b813a8426236 100644 --- a/uitests/uitests/environment.py +++ b/uitests/uitests/environment.py @@ -240,14 +240,14 @@ def after_step(context, step): if add_screenshot or step.exception is not None: try: uitests.vscode.application.capture_screen(context) - # # We might want folder view in screenshoits as well. + # # We might want folder view in screenshots as well. # uitests.vscode.quick_open.select_command(context, "View: Show Explorer") # uitests.vscode.application.capture_screen(context) # # We might want panels without # uitests.vscode.notifications.clear() # uitests.vscode.application.capture_screen(context) except Exception: - # Possible vsc has died as part of the exceptiion. + # Possible vsc has died as part of the exception. # Or we closed it as part of a step. pass diff --git a/uitests/uitests/features/README.md b/uitests/uitests/features/README.md index 49cb58a13b7e..d2a67586cfb7 100644 --- a/uitests/uitests/features/README.md +++ b/uitests/uitests/features/README.md @@ -7,7 +7,7 @@ - Used to skip a feature/scenario. * @https://github.com/xxx/yyy.git - Can only be used at a feature level. - - The conents of the above repo will be used as the contents of the workspace folder. + - The contents of the above repo will be used as the contents of the workspace folder. - Note: assume the tag is `@https://github.com/DonJayamanne/pyvscSmokeTesting.git` - The above repo is cloned directly into the workspace. - If however the tag is `@https://github.com/DonJayamanne/pyvscSmokeTesting/testing` diff --git a/uitests/uitests/steps/core.py b/uitests/uitests/steps/core.py index d7356e2e85cd..eb536be05ff0 100644 --- a/uitests/uitests/steps/core.py +++ b/uitests/uitests/steps/core.py @@ -243,7 +243,7 @@ def log_message(context, message): @behave.then("take a screenshot") def capture_screen(context): - """Caprtures a screenshot.""" + """Captures a screenshot.""" uitests.vscode.application.capture_screen(context) diff --git a/uitests/uitests/vscode/application.py b/uitests/uitests/vscode/application.py index a2ae47bbb516..ed94879eef33 100644 --- a/uitests/uitests/vscode/application.py +++ b/uitests/uitests/vscode/application.py @@ -220,7 +220,7 @@ def reload(context): def clear_everything(context): - """Clears everyting within VS Code, that could interfer with tests. + """Clears everything within VS Code, that could interfer with tests. E.g. close opened editors, dismiss all messages.. """ @@ -247,7 +247,7 @@ def setup_workspace(context, source_repo=None): """ logging.debug(f"Setting up workspace folder from {source_repo}") - # On windows, create a new folder everytime. + # On windows, create a new folder every time. # Deleting/reverting changes doesn't work too well. # We get a number of access denied errors (files are in use). try: @@ -279,7 +279,7 @@ def setup_workspace(context, source_repo=None): # Meaning, we want to glon https://github.com/Microsoft/vscode-python # and want the workspace folder to be tree/master/build when cloned. if len(source_repo) > len(repo_url): - # Exclude trailing `.git` and take everthying after. + # Exclude trailing `.git` and take everything after. sub_directory = source_repo[len(repo_url[:-4]) + 1 :] context.options.workspace_folder = os.path.join( context.options.workspace_folder, os.path.sep.join(sub_directory.split("/")) diff --git a/uitests/uitests/vscode/documents.py b/uitests/uitests/vscode/documents.py index 09f006a6bad6..af30c29af7df 100644 --- a/uitests/uitests/vscode/documents.py +++ b/uitests/uitests/vscode/documents.py @@ -182,7 +182,7 @@ def get_current_line(context): ) match = LINE_COLUMN_REGEX_FROM_PY_STATUS_BAR.match(element.text) if match is None: - raise ValueError(f"Unable to detemrine line & column") + raise ValueError(f"Unable to determine line & column") return int(match.group("line")), int(match.group("col")) except Exception: uitests.vscode.application.capture_screen_to_file( @@ -229,7 +229,7 @@ def get_current_line(context): core.dispatch_keys(context.driver, Keys.ESCAPE, element=element) if match is None: - raise ValueError(f"Unable to detemrine line from Go to label") + raise ValueError(f"Unable to determine line from Go to label") return int(match.group("line")) @@ -238,7 +238,7 @@ def get_current_position(context, **kwargs): element = core.wait_for_element(context.driver, selector, **kwargs) match = LINE_COLUMN_REGEX.match(element.text) if match is None: - raise ValueError(f"Unable to detemrine line & column") + raise ValueError(f"Unable to determine line & column") return int(match.group("line")), int(match.group("col")) diff --git a/uitests/uitests/vscode/download.py b/uitests/uitests/vscode/download.py index 7d0dbd4062be..261d81098c72 100644 --- a/uitests/uitests/vscode/download.py +++ b/uitests/uitests/vscode/download.py @@ -72,7 +72,7 @@ def download_chrome_driver(download_path, channel="stable"): electron_version = _get_electron_version("stable") dir = os.path.dirname(os.path.realpath(__file__)) js_file = os.path.join(dir, "..", "js", "chromeDownloader.js") - # Use an exising npm package. + # Use an existing npm package. uitests.tools.run_command( ["node", js_file, electron_version, download_path], progress_message="Downloading chrome driver", diff --git a/uitests/uitests/vscode/notifications.py b/uitests/uitests/vscode/notifications.py index 5745974c3ce0..64f7203ade96 100644 --- a/uitests/uitests/vscode/notifications.py +++ b/uitests/uitests/vscode/notifications.py @@ -94,7 +94,7 @@ def find(elements): ] # Get a list of all notifications with the above message - # If the message isn't visisble yet, then no need to retry, we'll do that in dismiss. + # If the message isn't visible yet, then no need to retry, we'll do that in dismiss. elements = core.wait_for_elements(context.driver, selector, find, retry_count=2) if any(elements): return elements diff --git a/uitests/uitests/vscode/settings.py b/uitests/uitests/vscode/settings.py index 1250c3ef09a4..9bca1dce4299 100644 --- a/uitests/uitests/vscode/settings.py +++ b/uitests/uitests/vscode/settings.py @@ -107,7 +107,7 @@ def _send_command_to_bootstrap(context, crud_settings): uitests.vscode.quick_open.select_command(context, "Smoke: Update Settings") uitests.vscode.application.capture_screen(context) # Wait for 5 seconds for settings to get updated. - # If file has been deleted then yes it has been udpated, else error + # If file has been deleted then yes it has been updated, else error for i in range(10): if not os.path.exists(instructions_file): return