summaryrefslogtreecommitdiff
path: root/tests/integration/shell.py
diff options
context:
space:
mode:
authorAngelos Evripiotis <jevripiotis@bloomberg.net>2019-06-11 14:51:25 +0100
committerbst-marge-bot <marge-bot@buildstream.build>2019-06-18 09:45:00 +0000
commitd139abbc8cb322ab1249b4ae7b23f86e20d4eb93 (patch)
tree5195073968340b24a2fe11644912555e9271e984 /tests/integration/shell.py
parente55a89bffad51955c6c245eac5df98d025b586b9 (diff)
downloadbuildstream-d139abbc8cb322ab1249b4ae7b23f86e20d4eb93.tar.gz
CliIntegration: match methods to base class
Update 'run' to match the base class. This ensures that it is a fully substitutable sub-class. Introduce 'run_project_config' to allow explicit usage of extended functionality, which wouldn't necessarily be supported by a different subclass. By making the signatures deliberately match, we can use PyLint to ensure the signatures don't accidentally differ. Since we're already relying on `kwargs['project']` succeeding, enforce that run_project_config() only takes keyword arguments.
Diffstat (limited to 'tests/integration/shell.py')
-rw-r--r--tests/integration/shell.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/integration/shell.py b/tests/integration/shell.py
index 868064d5b..d0c9f1f99 100644
--- a/tests/integration/shell.py
+++ b/tests/integration/shell.py
@@ -33,7 +33,8 @@ DATA_DIR = os.path.join(
#
def execute_shell(cli, project, command, *, config=None, mount=None, element='base.bst', isolate=False):
# Ensure the element is built
- result = cli.run(project=project, project_config=config, args=['build', element])
+ result = cli.run_project_config(
+ project=project, project_config=config, args=['build', element])
assert result.exit_code == 0
args = ['shell']
@@ -44,7 +45,8 @@ def execute_shell(cli, project, command, *, config=None, mount=None, element='ba
args += ['--mount', host_path, target_path]
args += [element, '--', *command]
- return cli.run(project=project, project_config=config, args=args)
+ return cli.run_project_config(
+ project=project, project_config=config, args=args)
# Test running something through a shell, allowing it to find the