From e8548c063051524a35ae42bf6d912fd6820433df Mon Sep 17 00:00:00 2001 From: Joona Hoikkala Date: Wed, 28 Aug 2019 15:51:20 +0300 Subject: [PATCH] Split parsernode util tests to their own respective file --- .../certbot_apache/tests/parsernode_test.py | 22 ------------- .../tests/parsernode_util_test.py | 33 +++++++++++++++++++ 2 files changed, 33 insertions(+), 22 deletions(-) create mode 100644 certbot-apache/certbot_apache/tests/parsernode_util_test.py diff --git a/certbot-apache/certbot_apache/tests/parsernode_test.py b/certbot-apache/certbot_apache/tests/parsernode_test.py index 3b9e6b14f..7699bcf9b 100644 --- a/certbot-apache/certbot_apache/tests/parsernode_test.py +++ b/certbot-apache/certbot_apache/tests/parsernode_test.py @@ -118,28 +118,6 @@ class ParserNodeTest(unittest.TestCase): filepath="/some/file" ) - def test_unknown_parameter(self): - params = { - "comment": "x", - "ancestor": None, - "dirty": False, - "filepath": "/tmp", - "unknown": "x" - } - self.assertRaises(TypeError, DummyCommentNode, **params) - params["name"] = "unnamed" - params.pop("comment") - self.assertRaises(TypeError, DummyDirectiveNode, **params) - self.assertRaises(TypeError, DummyBlockNode, **params) - - def test_missing_required(self): - params = { - "ancestor": None, - "dirty": False, - "filepath": "/tmp", - } - self.assertRaises(TypeError, DummyCommentNode, **params) - if __name__ == "__main__": unittest.main() # pragma: no cover diff --git a/certbot-apache/certbot_apache/tests/parsernode_util_test.py b/certbot-apache/certbot_apache/tests/parsernode_util_test.py new file mode 100644 index 000000000..29ba871ab --- /dev/null +++ b/certbot-apache/certbot_apache/tests/parsernode_util_test.py @@ -0,0 +1,33 @@ +""" Tests for ParserNode utils """ +import unittest + +from certbot_apache.tests import parsernode_test + + +class ParserNodeUtilTest(unittest.TestCase): + """Tests for ParserNode utils""" + def test_unknown_parameter(self): + params = { + "comment": "x", + "ancestor": None, + "dirty": False, + "filepath": "/tmp", + "unknown": "x" + } + self.assertRaises(TypeError, parsernode_test.DummyCommentNode, **params) + params["name"] = "unnamed" + params.pop("comment") + self.assertRaises(TypeError, parsernode_test.DummyDirectiveNode, **params) + self.assertRaises(TypeError, parsernode_test.DummyBlockNode, **params) + + def test_missing_required(self): + params = { + "ancestor": None, + "dirty": False, + "filepath": "/tmp", + } + self.assertRaises(TypeError, parsernode_test.DummyCommentNode, **params) + + +if __name__ == "__main__": + unittest.main() # pragma: no cover