From 66443f844492823228f774f75323179892273045 Mon Sep 17 00:00:00 2001
From: Gleb Kashkin <g.kashkin@tarantool.org>
Date: Mon, 23 Jan 2023 08:14:41 +0000
Subject: [PATCH] test: add prompt setter to interactive helper
Interactive console test helper could be used for remote connection too,
for that purpose prompt needs to be changed accordingly to connection
type.
This patch introduces getter and setter for the prompt. Prompt is
configured per session, so it is advised to create a new session
for each test case (e.g. with before_each()).
NO_CHANGELOG=test helper change
NO_DOC=test helper change
(cherry picked from commit ed86a729ef4d5122380e2a18e9fe79dbdf86ead4)
---
test/interactive_tarantool.lua | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/test/interactive_tarantool.lua b/test/interactive_tarantool.lua
index 5218607a68..801c769ffd 100644
--- a/test/interactive_tarantool.lua
+++ b/test/interactive_tarantool.lua
@@ -156,8 +156,7 @@ function mt._assert_command_echo(self, prepared_command, opts)
local opts = opts or {}
local deadline = opts.deadline or (fiber.clock() + TIMEOUT)
- local prompt = 'tarantool> '
- local exp_echo = prompt .. prepared_command:rstrip('\n')
+ local exp_echo = self._prompt .. prepared_command:rstrip('\n')
local echo = self:read_line({deadline = deadline})
-- If readline wraps the line, prepare the commands for
@@ -211,6 +210,15 @@ function mt.assert_empty_response(self, opts)
end
end
+-- Prompt may be different for remote console.
+function mt.set_prompt(self, prompt)
+ self._prompt = prompt
+end
+
+function mt.prompt(self)
+ return self._prompt
+end
+
function mt.close(self)
self:_stop_stderr_logger()
self.ph:close()
@@ -255,6 +263,7 @@ function M.new(opts)
local res = setmetatable({
ph = ph,
_readahead_buffer = '',
+ _prompt = 'tarantool> ',
}, mt)
-- Log child's stderr.
@@ -284,10 +293,6 @@ end
-- {{{ Module constants
--- It may be different for remote console, but the module supports
--- only local console for now.
-M.PROMPT = 'tarantool> '
-
M.TAB = '\x09'
M.LF = '\x0a'
M.CR = '\x0d'
--
GitLab