From 7c1d3d195f7e7028dda6c07b47408e1fff843f10 Mon Sep 17 00:00:00 2001
From: Joona Hoikkala <joona@kuori.org>
Date: Fri, 16 Aug 2019 11:06:41 +0300
Subject: [PATCH] Fix inheritance in implemented test classes

---
 certbot-apache/certbot_apache/interfaces.py   |  2 +-
 .../certbot_apache/tests/parsernode_test.py   | 43 +++++--------------
 2 files changed, 11 insertions(+), 34 deletions(-)

diff --git a/certbot-apache/certbot_apache/interfaces.py b/certbot-apache/certbot_apache/interfaces.py
index d2731014d..182252d82 100644
--- a/certbot-apache/certbot_apache/interfaces.py
+++ b/certbot-apache/certbot_apache/interfaces.py
@@ -124,7 +124,7 @@ class ParserNode(object):
 
     # Filepath of the file where the configuration element for this ParserNode
     # object resides.
-    filepath: str
+    filepath: Optional[str]
     """
 
     @abc.abstractmethod
diff --git a/certbot-apache/certbot_apache/tests/parsernode_test.py b/certbot-apache/certbot_apache/tests/parsernode_test.py
index b44815af5..650146e96 100644
--- a/certbot-apache/certbot_apache/tests/parsernode_test.py
+++ b/certbot-apache/certbot_apache/tests/parsernode_test.py
@@ -7,58 +7,39 @@ from acme.magic_typing import Optional, Tuple  # pylint: disable=unused-import,
 from certbot_apache import interfaces
 
 
-
-class DummyCommentNode(interfaces.ParserNode):
-    """ A dummy class implementing CommentNode interface """
+class DummyParserNode(interfaces.ParserNode):
+    """ A dummy class implementing ParserNode interface """
     ancestor = None
-    comment = ""
     dirty = False
-    filename = ""
-
-    def metadata(self, key):  # pragma: no cover
-        """Metadata"""
-        pass
+    filepath = None
 
     def save(self, msg):  # pragma: no cover
         """Save"""
         pass
 
 
-class DummyDirectiveNode(interfaces.ParserNode):
+class DummyCommentNode(DummyParserNode):
+    """ A dummy class implementing CommentNode interface """
+    comment = ""
+
+
+class DummyDirectiveNode(DummyParserNode):
     """ A dummy class implementing DirectiveNode interface """
-    ancestor = None
     parameters = tuple()  # type: Tuple[str, ...]
-    dirty = False
     enabled = True
     name = ""
-    filename = ""
-
-    def metadata(self, key):  # pragma: no cover
-        """Metadata"""
-        pass
-
-    def save(self, msg):  # pragma: no cover
-        """Save"""
-        pass
 
     def set_parameters(self, parameters):  # pragma: no cover
         """Set parameters"""
         pass
 
 
-class DummyBlockNode(interfaces.BlockNode):
+class DummyBlockNode(DummyParserNode):
     """ A dummy class implementing BlockNode interface """
-    ancestor = None
     parameters = tuple()  # type: Tuple[str, ...]
     children = tuple()  # type: Tuple[interfaces.ParserNode, ...]
-    dirty = False
     enabled = True
     name = ""
-    filename = ""
-
-    def save(self, msg):  # pragma: no cover
-        """Save"""
-        pass
 
     def add_child_block(self, name, parameters=None, position=None):  # pragma: no cover
         """Add child block"""
@@ -88,10 +69,6 @@ class DummyBlockNode(interfaces.BlockNode):
         """Delete child"""
         pass
 
-    def metadata(self, key):  # pragma: no cover
-        """Metadata"""
-        pass
-
     def set_parameters(self, parameters):  # pragma: no cover
         """Set parameters"""
         pass