From b49a4f72daebf1d58147237bfe4408d360763ebe Mon Sep 17 00:00:00 2001 From: Daniel Watkins Date: Tue, 19 May 2020 11:11:46 -0400 Subject: [PATCH 1/2] test_resolv_conf: refresh stale comment --- cloudinit/config/tests/test_resolv_conf.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cloudinit/config/tests/test_resolv_conf.py b/cloudinit/config/tests/test_resolv_conf.py index f3d97b8276d..e413f9d401c 100644 --- a/cloudinit/config/tests/test_resolv_conf.py +++ b/cloudinit/config/tests/test_resolv_conf.py @@ -35,8 +35,7 @@ def test_target_fname_is_used_if_passed(self, m_render_to_file): # Patch in templater so we can assert on the actual generated content @mock.patch("cloudinit.templater.util.write_file") # Parameterise with the value to be passed to generate_resolv_conf as the - # `params` parameter, and a list of the expected lines after the header as - # `extra_lines`. + # params parameter, and the expected line after the header as extra_line. @pytest.mark.parametrize( "params,expected_extra_line", [ From cd0fc49c35fec3c60a25174310f424163fe4bcc4 Mon Sep 17 00:00:00 2001 From: Chad Smith Date: Tue, 19 May 2020 16:59:33 -0600 Subject: [PATCH 2/2] Update cloudinit/config/tests/test_resolv_conf.py --- cloudinit/config/tests/test_resolv_conf.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cloudinit/config/tests/test_resolv_conf.py b/cloudinit/config/tests/test_resolv_conf.py index e413f9d401c..6546a0b5ba8 100644 --- a/cloudinit/config/tests/test_resolv_conf.py +++ b/cloudinit/config/tests/test_resolv_conf.py @@ -35,7 +35,8 @@ def test_target_fname_is_used_if_passed(self, m_render_to_file): # Patch in templater so we can assert on the actual generated content @mock.patch("cloudinit.templater.util.write_file") # Parameterise with the value to be passed to generate_resolv_conf as the - # params parameter, and the expected line after the header as extra_line. + # params parameter, and the expected line after the header as + # expected_extra_line. @pytest.mark.parametrize( "params,expected_extra_line", [