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
|
@ -1,9 +1,10 @@
|
|||
import io
|
||||
import os
|
||||
import stat
|
||||
|
||||
import pytest
|
||||
|
||||
from pgcli.config import ensure_dir_exists
|
||||
from pgcli.config import ensure_dir_exists, skip_initial_comment
|
||||
|
||||
|
||||
def test_ensure_file_parent(tmpdir):
|
||||
|
@ -20,11 +21,23 @@ def test_ensure_existing_dir(tmpdir):
|
|||
|
||||
|
||||
def test_ensure_other_create_error(tmpdir):
|
||||
subdir = tmpdir.join("subdir")
|
||||
subdir = tmpdir.join('subdir"')
|
||||
rcfile = subdir.join("rcfile")
|
||||
|
||||
# trigger an oserror that isn't "directory already exists"
|
||||
# trigger an oserror that isn't "directory already exists"
|
||||
os.chmod(str(tmpdir), stat.S_IREAD)
|
||||
|
||||
with pytest.raises(OSError):
|
||||
ensure_dir_exists(str(rcfile))
|
||||
|
||||
|
||||
@pytest.mark.parametrize(
|
||||
"text, skipped_lines",
|
||||
(
|
||||
("abc\n", 1),
|
||||
("#[section]\ndef\n[section]", 2),
|
||||
("[section]", 0),
|
||||
),
|
||||
)
|
||||
def test_skip_initial_comment(text, skipped_lines):
|
||||
assert skip_initial_comment(io.StringIO(text)) == skipped_lines
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue