cerc-io/solidity
10
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Applying CI-reported fixes.

Browse Source
This commit is contained in:
Christian Parpart 2022-08-22 11:09:08 +02:00
parent d31e4dcc0a
commit d0854cb485
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
test/lsp.py
View File

@ -1,6 +1,7 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
# pragma pylint: disable=too-many-lines # pragma pylint: disable=too-many-lines
# test line 1 # test line 1
from __future__ import annotations # See: https://github.com/PyCQA/pylint/issues/3320
import argparse import argparse
import fnmatch import fnmatch
import functools import functools
@ -422,7 +423,7 @@ class TestParser:
self.next_line() self.next_line()
def parseDiagnostics(self) -> Diagnostics: def parseDiagnostics(self) -> TestParser.Diagnostics:
""" """
Parse diagnostic expectations specified in the file. Parse diagnostic expectations specified in the file.
Returns a named tuple instance of "Diagnostics" Returns a named tuple instance of "Diagnostics"
@ -454,7 +455,7 @@ class TestParser:
return self.Diagnostics(**diagnostics) return self.Diagnostics(**diagnostics)
def parseRequestAndResponse(self) -> RequestAndResponse: def parseRequestAndResponse(self) -> TestParser.RequestAndResponse:
RESPONSE_START = "// <- " RESPONSE_START = "// <- "
REQUEST_END = "// }" REQUEST_END = "// }"
COMMENT_PREFIX = "// " COMMENT_PREFIX = "// "
@ -915,7 +916,7 @@ class SolidityLSPTestSuite: # {{{
lsp: JsonRpcProcess, lsp: JsonRpcProcess,
expose_project_root=True, expose_project_root=True,
file_load_strategy: FileLoadStrategy=FileLoadStrategy.DirectlyOpenedAndOnImport, file_load_strategy: FileLoadStrategy=FileLoadStrategy.DirectlyOpenedAndOnImport,
custom_include_paths: list[str] = [], custom_include_paths: list[str] = None,
project_root_subdir=None project_root_subdir=None
): ):
""" """
@ -950,7 +951,7 @@ class SolidityLSPTestSuite: # {{{
params['initializationOptions'] = {} params['initializationOptions'] = {}
params['initializationOptions']['file-load-strategy'] = file_load_strategy.lsp_name() params['initializationOptions']['file-load-strategy'] = file_load_strategy.lsp_name()
if len(custom_include_paths) != 0: if custom_include_paths is not None and len(custom_include_paths) != 0:
if params['initializationOptions'] is None: if params['initializationOptions'] is None:
params['initializationOptions'] = {} params['initializationOptions'] = {}
params['initializationOptions']['include-paths'] = custom_include_paths params['initializationOptions']['include-paths'] = custom_include_paths
@ -1412,7 +1413,11 @@ class SolidityLSPTestSuite: # {{{
custom_include_paths=[f"{self.project_root_dir}/other-include-dir"] custom_include_paths=[f"{self.project_root_dir}/other-include-dir"]
) )
published_diagnostics = self.wait_for_diagnostics(solc) published_diagnostics = self.wait_for_diagnostics(solc)
self.expect_equal(len(published_diagnostics), len(EXPECTED_FILES) + IMPLICITLY_LOADED_FILE_COUNT, "Test number of files analyzed.") self.expect_equal(
len(published_diagnostics),
len(EXPECTED_FILES) + IMPLICITLY_LOADED_FILE_COUNT,
"Test number of files analyzed."
)
# All but the last report should be from expected files # All but the last report should be from expected files
for report in published_diagnostics[:-IMPLICITLY_LOADED_FILE_COUNT]: for report in published_diagnostics[:-IMPLICITLY_LOADED_FILE_COUNT]: