mirrors
/
pgcli
mirror of https://github.com/dbcli/pgcli
1
0
Fork 0
Code

behave fix clean up 

In an earlier commit I've changed the current working directory and
the removal of a temporary file didn't take that into account.
This commit is contained in:
Dick Marinus 2017-04-29 08:21:48 +02:00
parent fb25e4b923
commit d71032c37f
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.rst
View File

@ -19,6 +19,7 @@ Internal changes:
* Add pager wrapper for behave tests (Thanks: `Dick Marinus`_).
* Behave quit pgcli nicely (Thanks: `Dick Marinus`_).
* Behave test source command (Thanks: `Dick Marinus`_).
* Behave fix clean up. (Thanks: `Dick Marinus`_).
1.5.1
=====

23
tests/features/steps/iocommands.py
View File

@ -1,6 +1,7 @@
# -*- coding: utf-8
from __future__ import unicode_literals
import os
import os.path
import wrappers
from behave import when, then
@ -8,14 +9,16 @@ from behave import when, then
@when('we start external editor providing a file name')
def step_edit_file(context):
"""
Edit file with external editor.
"""
context.editor_file_name = 'test_file_{0}.sql'.format(context.conf['vi'])
if os.path.exists(context.editor_file_name):
os.remove(context.editor_file_name)
context.cli.sendline('\e {0}'.format(context.editor_file_name))
wrappers.expect_exact(context, 'Entering Ex mode. Type "visual" to go to Normal mode.', timeout=2)
"""Edit file with external editor."""
context.editor_file_name = [
'..',
'test_file_{0}.sql'.format(context.conf['vi'])
]
if os.path.exists(os.path.join(*context.editor_file_name)):
os.remove(os.path.join(*context.editor_file_name))
context.cli.sendline('\e {0}'.format(context.editor_file_name[1]))
wrappers.expect_exact(
context, 'Entering Ex mode. Type "visual" to go to Normal mode.', timeout=2)
wrappers.expect_exact(context, '\r\n:', timeout=2)
@ -40,5 +43,5 @@ def step_edit_done_sql(context):
# Cleanup the command line.
context.cli.sendcontrol('c')
# Cleanup the edited file.
if context.editor_file_name and os.path.exists(context.editor_file_name):
os.remove(context.editor_file_name)
if os.path.join(*context.editor_file_name) and os.path.exists(os.path.join(*context.editor_file_name)):
os.remove(os.path.join(*context.editor_file_name))