conflict res after patching

This commit is contained in:
Deepak Agrawal 2018-06-07 15:55:03 +05:30 committed by Matt Clay
parent 3278ef4a6b
commit ccf2d9c8cc
3 changed files with 3 additions and 3 deletions

View file

@ -252,7 +252,8 @@ class CliConfiguration(ConfigBase):
def parse_hostname(self, config):
match = re.search(r'^hostname (\S+)', config, re.M)
return match.group(1)
if match:
return match.group(1)
def parse_domain_name(self, config):
match = re.search(r'^domain name (\S+)', config, re.M)

View file

@ -22,6 +22,6 @@
- assert:
that:
- "result.changed == true"
- "result.changed == false"
- debug: msg="END cli/misplaced_sublevel.yaml on connection={{ ansible_connection }}"

View file

@ -22,7 +22,6 @@
- assert:
that:
- result.changed == true
- result.commands|length == 3
- "'domain name-server 1.1.1.1' in result.commands"
- "'domain name-server 2.2.2.2' in result.commands"
- "'domain name-server 3.3.3.3' in result.commands"