diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/frontend/artifact_list_contents.py | 2 | ||||
| -rw-r--r-- | tests/frontend/init.py | 2 | ||||
| -rw-r--r-- | tests/frontend/logging.py | 4 | ||||
| -rw-r--r-- | tests/integration/shell.py | 2 | ||||
| -rw-r--r-- | tests/testutils/junction.py | 2 |
5 files changed, 5 insertions, 7 deletions
diff --git a/tests/frontend/artifact_list_contents.py b/tests/frontend/artifact_list_contents.py index a1473c806..8bd7bdeff 100644 --- a/tests/frontend/artifact_list_contents.py +++ b/tests/frontend/artifact_list_contents.py @@ -39,7 +39,7 @@ def test_artifact_list_exact_contents_element(cli, datafiles): # List the contents via the element name result = cli.run(project=project, args=["artifact", "list-contents", "import-bin.bst"]) assert result.exit_code == 0 - expected_output = "import-bin.bst:\n" "\tusr\n" "\tusr/bin\n" "\tusr/bin/hello\n\n" + expected_output = "import-bin.bst:\n\tusr\n\tusr/bin\n\tusr/bin/hello\n\n" assert expected_output in result.output diff --git a/tests/frontend/init.py b/tests/frontend/init.py index db1b9c955..3f897fb14 100644 --- a/tests/frontend/init.py +++ b/tests/frontend/init.py @@ -138,7 +138,7 @@ def test_element_path_interactive(cli, tmp_path, monkeypatch, element_path): def create(cls, *args, **kwargs): return DummyInteractiveApp(*args, **kwargs) - def _init_project_interactive(self, *args, **kwargs): # pylint: disable=arguments-differ + def _init_project_interactive(self, *args, **kwargs): # pylint: disable=signature-differs return ("project_name", "2.0", element_path) monkeypatch.setattr(App, "create", DummyInteractiveApp.create) diff --git a/tests/frontend/logging.py b/tests/frontend/logging.py index 7db37fa4c..6eb058990 100644 --- a/tests/frontend/logging.py +++ b/tests/frontend/logging.py @@ -48,9 +48,7 @@ def test_custom_logging(cli, tmpdir, datafiles): element_path = os.path.join(project, "elements") element_name = "fetch-test-git.bst" - custom_log_format = ( - "%{elapsed},%{elapsed-us},%{wallclock},%{wallclock-us}," "%{key},%{element},%{action},%{message}" - ) + custom_log_format = "%{elapsed},%{elapsed-us},%{wallclock},%{wallclock-us},%{key},%{element},%{action},%{message}" user_config = {"logging": {"message-format": custom_log_format}} cli.configure(user_config) diff --git a/tests/integration/shell.py b/tests/integration/shell.py index 11aba87da..42e486bac 100644 --- a/tests/integration/shell.py +++ b/tests/integration/shell.py @@ -331,7 +331,7 @@ def test_integration_external_workspace(cli, tmpdir_factory, datafiles, build_sh if guess_element: # Mutate the project.conf to use a default shell command project_file = os.path.join(project, "project.conf") - config_text = "shell:\n" " command: ['true']\n" + config_text = "shell:\n command: ['true']\n" with open(project_file, "a") as f: f.write(config_text) diff --git a/tests/testutils/junction.py b/tests/testutils/junction.py index 99117b2cf..4889fdb24 100644 --- a/tests/testutils/junction.py +++ b/tests/testutils/junction.py @@ -15,7 +15,7 @@ from buildstream.testing import create_repo # Returns: # (str): The ref # -def generate_junction(tmpdir, subproject_path, junction_path, *, store_ref=True, options={}): +def generate_junction(tmpdir, subproject_path, junction_path, *, store_ref=True, options=None): # Create a repo to hold the subproject and generate # a junction element for it # |