summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJürg Billeter <j@bitron.ch>2019-11-12 15:20:44 +0100
committerJürg Billeter <j@bitron.ch>2019-12-05 11:05:11 +0100
commit6cdc8f38235d31d0e48150d2affe45d3df3e9ec8 (patch)
treef16bee44a7077a2757a21df6497a598643c97d87
parent0189c0047cb2f3d8f0ed0b43f12a9ddc5260dabb (diff)
downloadbuildstream-6cdc8f38235d31d0e48150d2affe45d3df3e9ec8.tar.gz
testing/runcli.py: Remove unused configure parameter from run() methods
-rw-r--r--src/buildstream/testing/runcli.py39
1 files changed, 5 insertions, 34 deletions
diff --git a/src/buildstream/testing/runcli.py b/src/buildstream/testing/runcli.py
index d4f7e2ffd..c0e278b11 100644
--- a/src/buildstream/testing/runcli.py
+++ b/src/buildstream/testing/runcli.py
@@ -288,24 +288,13 @@ class Cli:
# to stay contained in the testing environment.
#
# Args:
- # configure (bool): Whether to pass a --config argument
# project (str): An optional path to a project
# silent (bool): Whether to pass --no-verbose
# env (dict): Environment variables to temporarily set during the test
# args (list): A list of arguments to pass buildstream
# binary_capture (bool): Whether to capture the stdout/stderr as binary
#
- def run(
- self,
- configure=True,
- project=None,
- silent=False,
- env=None,
- cwd=None,
- options=None,
- args=None,
- binary_capture=False,
- ):
+ def run(self, project=None, silent=False, env=None, cwd=None, options=None, args=None, binary_capture=False):
# We don't want to carry the state of one bst invocation into another
# bst invocation. Since node _FileInfo objects hold onto BuildStream
@@ -331,9 +320,8 @@ class Cli:
if silent:
bst_args += ["--no-verbose"]
- if configure:
- config_file = stack.enter_context(configured(self.directory, self.config))
- bst_args += ["--config", config_file]
+ config_file = stack.enter_context(configured(self.directory, self.config))
+ bst_args += ["--config", config_file]
if project:
bst_args += ["--directory", str(project)]
@@ -495,26 +483,9 @@ class CliIntegration(Cli):
#
# This supports the same arguments as Cli.run(), see run_project_config().
#
- def run(
- self,
- configure=True,
- project=None,
- silent=False,
- env=None,
- cwd=None,
- options=None,
- args=None,
- binary_capture=False,
- ):
+ def run(self, project=None, silent=False, env=None, cwd=None, options=None, args=None, binary_capture=False):
return self.run_project_config(
- configure=configure,
- project=project,
- silent=silent,
- env=env,
- cwd=cwd,
- options=options,
- args=args,
- binary_capture=binary_capture,
+ project=project, silent=silent, env=env, cwd=cwd, options=options, args=args, binary_capture=binary_capture
)
# run_project_config()