summaryrefslogtreecommitdiffstats
path: root/tests/features
diff options
context:
space:
mode:
authorDmitry B <oxitnik@gmail.com>2017-10-06 22:30:21 +0300
committerDmitry B <oxitnik@gmail.com>2017-10-06 22:30:21 +0300
commite1f066cdb355d6787c22eb65bd4ee6a3c2e2d9d8 (patch)
tree9afdcb239434ed41762a390ee9cf4915bbba141d /tests/features
parentd6fe970f3c0dba20fc6b8f4fe1aef2b83f591161 (diff)
parent5435b4671577621a3696c5ddd8182779126ccad7 (diff)
Merge remote-tracking branch 'upstream/master' into feature_use_temp_config_for_tests
Diffstat (limited to 'tests/features')
-rw-r--r--tests/features/environment.py1
-rw-r--r--tests/features/iocommands.feature2
-rw-r--r--tests/features/steps/iocommands.py4
3 files changed, 4 insertions, 3 deletions
diff --git a/tests/features/environment.py b/tests/features/environment.py
index d861b166..63f65c70 100644
--- a/tests/features/environment.py
+++ b/tests/features/environment.py
@@ -144,6 +144,7 @@ def after_scenario(context, _):
'{0}> '.format(dbname),
timeout=5
)
+ context.cli.sendcontrol('u')
context.cli.sendcontrol('d')
context.cli.expect_exact(pexpect.EOF, timeout=5)
diff --git a/tests/features/iocommands.feature b/tests/features/iocommands.feature
index 38efbbb0..dad7d10e 100644
--- a/tests/features/iocommands.feature
+++ b/tests/features/iocommands.feature
@@ -12,6 +12,6 @@ Feature: I/O commands
and we wait for prompt
and we query "select 123456"
and we wait for prompt
- and we notee output
+ and we stop teeing output
and we wait for prompt
then we see 123456 in tee output
diff --git a/tests/features/steps/iocommands.py b/tests/features/steps/iocommands.py
index bc0eb755..79416bb2 100644
--- a/tests/features/steps/iocommands.py
+++ b/tests/features/steps/iocommands.py
@@ -67,9 +67,9 @@ def step_query_select_123456(context):
context.cli.sendline('select 123456')
-@when(u'we notee output')
+@when(u'we stop teeing output')
def step_notee_output(context):
- context.cli.sendline('notee')
+ context.cli.sendline('\o')
wrappers.expect_exact(context, "Time", timeout=5)