Merge branch 'comments-white-space' of polyzen/borgmatic into master
This commit is contained in:
commit
f2198de151
2 changed files with 12 additions and 12 deletions
|
@ -45,10 +45,10 @@ def _comment_out_line(line):
|
|||
# Comment out the names of optional sections.
|
||||
one_indent = ' ' * INDENT
|
||||
if not line.startswith(one_indent):
|
||||
return '#' + line
|
||||
return '# ' + line
|
||||
|
||||
# Otherwise, comment out the line, but insert the "#" after the first indent for aesthetics.
|
||||
return '#'.join((one_indent, line[INDENT:]))
|
||||
return '# '.join((one_indent, line[INDENT:]))
|
||||
|
||||
|
||||
REQUIRED_KEYS = {'source_directories', 'repositories', 'keep_daily'}
|
||||
|
|
|
@ -31,17 +31,17 @@ def test_comment_out_line_skips_already_commented_out_line():
|
|||
def test_comment_out_line_comments_section_name():
|
||||
line = 'figgy-pudding:'
|
||||
|
||||
assert module._comment_out_line(line) == '#' + line
|
||||
assert module._comment_out_line(line) == '# ' + line
|
||||
|
||||
|
||||
def test_comment_out_line_comments_indented_option():
|
||||
line = ' enabled: true'
|
||||
|
||||
assert module._comment_out_line(line) == ' #enabled: true'
|
||||
assert module._comment_out_line(line) == ' # enabled: true'
|
||||
|
||||
|
||||
def test_comment_out_optional_configuration_comments_optional_config_only():
|
||||
flexmock(module)._comment_out_line = lambda line: '#' + line
|
||||
flexmock(module)._comment_out_line = lambda line: '# ' + line
|
||||
config = '''
|
||||
foo:
|
||||
bar:
|
||||
|
@ -57,7 +57,7 @@ location:
|
|||
'''
|
||||
|
||||
expected_config = '''
|
||||
#foo:
|
||||
# foo:
|
||||
# bar:
|
||||
# - baz
|
||||
# - quux
|
||||
|
|
Loading…
Reference in a new issue