diff options
| author | hitsumabushi <hitsumabushi.org@gmail.com> | 2018-07-11 14:59:07 +0900 |
|---|---|---|
| committer | Ganesh Nalawade <ganesh634@gmail.com> | 2018-07-11 11:29:07 +0530 |
| commit | cf7a42b4f4f09a0383f6ab2a4147e7bb7a6c3008 (patch) | |
| tree | dcd9899d5e4a104b61464b8b59721ab75af1995c /test | |
| parent | 940d4a0e898b950363f4d2fccb02ad430e5a294f (diff) | |
| download | ansible-cf7a42b4f4f09a0383f6ab2a4147e7bb7a6c3008.tar.gz | |
allow empty line in src template file (#42493)
Diffstat (limited to 'test')
| -rw-r--r-- | test/units/modules/network/vyos/fixtures/vyos_config_src.cfg | 1 | ||||
| -rw-r--r-- | test/units/modules/network/vyos/test_vyos_config.py | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/test/units/modules/network/vyos/fixtures/vyos_config_src.cfg b/test/units/modules/network/vyos/fixtures/vyos_config_src.cfg index ca6abebc9a..18cd793718 100644 --- a/test/units/modules/network/vyos/fixtures/vyos_config_src.cfg +++ b/test/units/modules/network/vyos/fixtures/vyos_config_src.cfg @@ -1,4 +1,5 @@ set system host-name foo + delete interfaces ethernet eth0 address set interfaces ethernet eth1 address '6.7.8.9/24' set interfaces ethernet eth1 description 'test string' diff --git a/test/units/modules/network/vyos/test_vyos_config.py b/test/units/modules/network/vyos/test_vyos_config.py index bd73b7540e..a923193af9 100644 --- a/test/units/modules/network/vyos/test_vyos_config.py +++ b/test/units/modules/network/vyos/test_vyos_config.py @@ -75,15 +75,17 @@ class TestVyosConfigModule(TestVyosModule): def test_vyos_config_src(self): src = load_fixture('vyos_config_src.cfg') set_module_args(dict(src=src)) + candidate = '\n'.join(self.module.format_commands(src.splitlines())) commands = ['set system host-name foo', 'delete interfaces ethernet eth0 address'] - self.conn.get_diff = MagicMock(return_value=self.cliconf_obj.get_diff(src, self.running_config)) + self.conn.get_diff = MagicMock(return_value=self.cliconf_obj.get_diff(candidate, self.running_config)) self.execute_module(changed=True, commands=commands) def test_vyos_config_src_brackets(self): src = load_fixture('vyos_config_src_brackets.cfg') set_module_args(dict(src=src)) + candidate = '\n'.join(self.module.format_commands(src.splitlines())) commands = ['set interfaces ethernet eth0 address 10.10.10.10/24', 'set system host-name foo'] - self.conn.get_diff = MagicMock(return_value=self.cliconf_obj.get_diff(src, self.running_config)) + self.conn.get_diff = MagicMock(return_value=self.cliconf_obj.get_diff(candidate, self.running_config)) self.execute_module(changed=True, commands=commands) def test_vyos_config_backup(self): |