1
0
mirror of https://github.com/certbot/certbot.git synced 2026-01-26 07:41:33 +03:00

[Apache v2] Implement save() and unsaved_files() (#7520)

* Implement save() and unsaved_files()

* Linter fix
This commit is contained in:
Joona Hoikkala
2019-11-13 00:19:21 +02:00
committed by ohemorange
parent bdf24d2bed
commit d14eec9ecf
2 changed files with 16 additions and 4 deletions

View File

@@ -97,8 +97,8 @@ class AugeasParserNode(interfaces.ParserNode):
except KeyError:
raise errors.PluginError("Augeas path is required")
def save(self, msg): # pragma: no cover
pass
def save(self, msg):
self.parser.save(msg)
class AugeasCommentNode(AugeasParserNode):
@@ -304,9 +304,9 @@ class AugeasBlockNode(AugeasDirectiveNode):
"""Deletes a ParserNode from the sequence of children"""
pass
def unsaved_files(self): # pragma: no cover
def unsaved_files(self):
"""Returns a list of unsaved filepaths"""
return [assertions.PASS]
return self.parser.unsaved_files()
def _create_commentnode(self, path):
"""Helper function to create a CommentNode from Augeas path"""

View File

@@ -20,6 +20,18 @@ class AugeasParserNodeTest(util.ApacheTest): # pylint: disable=too-many-public-
self.vh_truth = util.get_vh_truth(
self.temp_dir, "debian_apache_2_4/multiple_vhosts")
def test_save(self):
with mock.patch('certbot_apache.parser.ApacheParser.save') as mock_save:
self.config.parser_root.save("A save message")
self.assertTrue(mock_save.called)
self.assertEqual(mock_save.call_args[0][0], "A save message")
def test_unsaved_files(self):
with mock.patch('certbot_apache.parser.ApacheParser.unsaved_files') as mock_uf:
mock_uf.return_value = ["first", "second"]
files = self.config.parser_root.unsaved_files()
self.assertEqual(files, ["first", "second"])
def test_get_block_node_name(self):
from certbot_apache.augeasparser import AugeasBlockNode
block = AugeasBlockNode(