Merging upstream version 3.2.0.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
a868bb3d29
commit
39b7cc8559
50 changed files with 952 additions and 634 deletions
|
@ -39,9 +39,15 @@ def expect_exact(context, expected, timeout):
|
|||
|
||||
|
||||
def expect_pager(context, expected, timeout):
|
||||
formatted = expected if isinstance(expected, list) else [expected]
|
||||
formatted = [
|
||||
f"{context.conf['pager_boundary']}\r\n{t}{context.conf['pager_boundary']}\r\n"
|
||||
for t in formatted
|
||||
]
|
||||
|
||||
expect_exact(
|
||||
context,
|
||||
"{0}\r\n{1}{0}\r\n".format(context.conf["pager_boundary"], expected),
|
||||
formatted,
|
||||
timeout=timeout,
|
||||
)
|
||||
|
||||
|
@ -57,7 +63,7 @@ def run_cli(context, run_args=None, prompt_check=True, currentdb=None):
|
|||
context.cli.logfile = context.logfile
|
||||
context.exit_sent = False
|
||||
context.currentdb = currentdb or context.conf["dbname"]
|
||||
context.cli.sendline("\pset pager always")
|
||||
context.cli.sendline(r"\pset pager always")
|
||||
if prompt_check:
|
||||
wait_prompt(context)
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue