summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorDamien Baty <damien@damienbaty.com>2023-09-27 06:36:59 +0200
committerGitHub <noreply@github.com>2023-09-26 21:36:59 -0700
commitcdfa35830ba922f1934996f0398e7ab468c016d2 (patch)
treee33d702ff9fc2d8e67f2330e2ba7688512213c85 /tests
parented89c154ee2af7edcdacc092fe357e8ceeb30312 (diff)
Ask for confirmation to quit cli if a transaction is ongoing. (#1400)
If user tries to quit the cli while a transaction is ongoing (i.e. begun, but not committed or rolled back yet), pgcli now asks for a confirmation. The user can choose to commit, rollback or cancel the exit. If the user chooses to commit or rollback, we exit only if the commit/rollback succeeds. Fixes #1071.
Diffstat (limited to 'tests')
-rw-r--r--tests/features/basic_commands.feature17
-rw-r--r--tests/features/steps/basic_commands.py34
2 files changed, 49 insertions, 2 deletions
diff --git a/tests/features/basic_commands.feature b/tests/features/basic_commands.feature
index da27bb96..ee497b98 100644
--- a/tests/features/basic_commands.feature
+++ b/tests/features/basic_commands.feature
@@ -23,6 +23,23 @@ Feature: run the cli,
When we send "ctrl + d"
then dbcli exits
+ Scenario: confirm exit when a transaction is ongoing
+ When we begin transaction
+ and we try to send "ctrl + d"
+ then we see ongoing transaction message
+ when we send "c"
+ then dbcli exits
+
+ Scenario: cancel exit when a transaction is ongoing
+ When we begin transaction
+ and we try to send "ctrl + d"
+ then we see ongoing transaction message
+ when we send "a"
+ then we see dbcli prompt
+ when we rollback transaction
+ when we send "ctrl + d"
+ then dbcli exits
+
Scenario: interrupt current query via "ctrl + c"
When we send sleep query
and we send "ctrl + c"
diff --git a/tests/features/steps/basic_commands.py b/tests/features/steps/basic_commands.py
index 3b5c82b3..8f184bbd 100644
--- a/tests/features/steps/basic_commands.py
+++ b/tests/features/steps/basic_commands.py
@@ -64,13 +64,22 @@ def step_ctrl_d(context):
"""
Send Ctrl + D to hopefully exit.
"""
+ step_try_to_ctrl_d(context)
+ context.cli.expect(pexpect.EOF, timeout=5)
+ context.exit_sent = True
+
+
+@when('we try to send "ctrl + d"')
+def step_try_to_ctrl_d(context):
+ """
+ Send Ctrl + D, perhaps exiting, perhaps not (if a transaction is
+ ongoing).
+ """
# turn off pager before exiting
context.cli.sendcontrol("c")
context.cli.sendline(r"\pset pager off")
wrappers.wait_prompt(context)
context.cli.sendcontrol("d")
- context.cli.expect(pexpect.EOF, timeout=5)
- context.exit_sent = True
@when('we send "ctrl + c"')
@@ -87,6 +96,14 @@ def step_see_cancelled_query_warning(context):
wrappers.expect_exact(context, "cancelled query", timeout=2)
+@then("we see ongoing transaction message")
+def step_see_ongoing_transaction_error(context):
+ """
+ Make sure we receive the warning that a transaction is ongoing.
+ """
+ context.cli.expect("A transaction is ongoing.", timeout=2)
+
+
@when("we send sleep query")
def step_send_sleep_15_seconds(context):
"""
@@ -199,3 +216,16 @@ def step_resppond_to_destructive_command(context, response):
def step_send_password(context):
wrappers.expect_exact(context, "Password for", timeout=5)
context.cli.sendline(context.conf["pass"] or "DOES NOT MATTER")
+
+
+@when('we send "{text}"')
+def step_send_text(context, text):
+ context.cli.sendline(text)
+ # Try to detect whether we are exiting. If so, set `exit_sent`
+ # so that `after_scenario` correctly cleans up.
+ try:
+ context.cli.expect(pexpect.EOF, timeout=0.2)
+ except pexpect.TIMEOUT:
+ pass
+ else:
+ context.exit_sent = True