majic-ansible-roles Changeset

Changeset - 8927efb4fb61

Parent rev.

Child rev.

[Not reviewed]

0 3 0

Branko Majic (branko) - 4 years ago 2020-01-06 22:26:55
branko@majic.rs

MAR-148: Fixed tests for the mail_server roles (newline stripping from output).

3 files changed with 6 insertions and 6 deletions:

roles/mail_forwarder/molecule/default/tests/test_mandatory.py

roles/mail_forwarder/molecule/default/tests/test_optional.py

roles/mail_forwarder/molecule/default/tests/test_smtp_relay_host_port.py

0 comments (0 inline, 0 general)

roles/mail_forwarder/molecule/default/tests/test_mandatory.py

➞

Show inline comments

@@ @@ -24,7 +24,7 @@ def test_smtp_mailname(host): @@
     Tests if SMTP mailname configuration file has correct content.
     """
     hostname = host.run('hostname').stdout
+    hostname = host.run('hostname').stdout.strip()
     mailname = host.file('/etc/mailname')
@@ @@ -36,7 +36,7 @@ def test_postfix_main_cf_file_content(host): @@
     Tests if the Postfix main configuration file content is correct.
     """
     hostname = host.run('hostname').stdout
+    hostname = host.run('hostname').stdout.strip()
     config = host.file('/etc/postfix/main.cf')
     config_lines = config.content.split("\n")

roles/mail_forwarder/molecule/default/tests/test_optional.py

➞

Show inline comments

@@ @@ -24,7 +24,7 @@ def test_smtp_mailname(host): @@
     Tests if SMTP mailname has been configured correctly.
     """
     hostname = host.run('hostname').stdout
+    hostname = host.run('hostname').stdout.strip()
     mailname = host.file('/etc/mailname')
@@ @@ -36,7 +36,7 @@ def test_postfix_main_cf_file_content(host): @@
     Tests if the Postfix main configuration file content is correct.
     """
     hostname = host.run('hostname').stdout
+    hostname = host.run('hostname').stdout.strip()
     config = host.file('/etc/postfix/main.cf')
     config_lines = config.content.split("\n")
@@ @@ -54,7 +54,7 @@ def test_local_aliases(host): @@
     Tests if local aliases are configured correctly.
     """
     hostname = host.run('hostname').stdout
+    hostname = host.run('hostname').stdout.strip()
     send = host.run('swaks --suppress-data --to root@localhost')
     assert send.rc == 0
     message_id = re.search('Ok: queued as (.*)', send.stdout).group(1)

roles/mail_forwarder/molecule/default/tests/test_smtp_relay_host_port.py

➞

Show inline comments

@@ @@ -15,7 +15,7 @@ def test_postfix_main_cf_file_content(host): @@
     Tests if the Postfix main configuration file content is correct.
     """
     hostname = host.run('hostname').stdout
+    hostname = host.run('hostname').stdout.strip()
     config = host.file('/etc/postfix/main.cf')
     config_lines = config.content.split("\n")

0 comments (0 inline, 0 general)