From 57b1e111d65082794c04f81be5a3d7f608483341 2018-05-27 19:41:25
From: Branko Majic <branko@majic.rs>
Date: 2018-05-27 19:41:25
Subject: [PATCH] MAR-129: Updated backup_server role tests and fixed some issues:

- Updated how the tests are referencing the relevant hosts to run the
  tests on.
- Use "state: present" for package installation.

---

diff --git a/roles/backup_server/molecule/default/tests/test_default.py b/roles/backup_server/molecule/default/tests/test_default.py
index 9a5d9ccb10282a9c912183218a10099d24a48a6e..a3a1f99b8fc828458cffa00feb6315426ba71c6c 100644
--- a/roles/backup_server/molecule/default/tests/test_default.py
+++ b/roles/backup_server/molecule/default/tests/test_default.py
@@ -1,7 +1,10 @@
+import os
+
 import testinfra.utils.ansible_runner
 
+
 testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
-    '.molecule/ansible_inventory.yml').get_hosts('all')
+    os.environ['MOLECULE_INVENTORY_FILE']).get_hosts(['parameters-mandatory', 'parameters-optional'])
 
 
 def test_installed_software(host):
diff --git a/roles/backup_server/molecule/default/tests/test_parameters_mandatory.py b/roles/backup_server/molecule/default/tests/test_parameters_mandatory.py
index 7719c1d433ce7b65e2a199f6b06d9e798d1507eb..ab9c0b9108586919a5b71faced26d73a50d16d39 100644
--- a/roles/backup_server/molecule/default/tests/test_parameters_mandatory.py
+++ b/roles/backup_server/molecule/default/tests/test_parameters_mandatory.py
@@ -1,8 +1,10 @@
+import os
+
 import testinfra.utils.ansible_runner
 
 
 testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
-    '.molecule/ansible_inventory.yml').get_hosts('parameters-mandatory')
+    os.environ['MOLECULE_INVENTORY_FILE']).get_hosts(['parameters-mandatory'])
 
 
 def test_firewall_configuration(host):
diff --git a/roles/backup_server/molecule/default/tests/test_parameters_optional.py b/roles/backup_server/molecule/default/tests/test_parameters_optional.py
index 0e0f47ff8857c600cd6dfba61afab968e0b4c4f3..5cc2ff9d11938865f82e75097794bc2883c0651a 100644
--- a/roles/backup_server/molecule/default/tests/test_parameters_optional.py
+++ b/roles/backup_server/molecule/default/tests/test_parameters_optional.py
@@ -4,7 +4,7 @@ import testinfra.utils.ansible_runner
 
 
 testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
-    '.molecule/ansible_inventory.yml').get_hosts('parameters-optional')
+    os.environ['MOLECULE_INVENTORY_FILE']).get_hosts(['parameters-optional'])
 
 
 def test_backup_client_users_and_groups(host):
diff --git a/roles/backup_server/tasks/main.yml b/roles/backup_server/tasks/main.yml
index 047c52ac038ca2e3737660236632e446bb6fcb5f..fdff18816a2092316581c7cf1eaf618c700dffc9 100644
--- a/roles/backup_server/tasks/main.yml
+++ b/roles/backup_server/tasks/main.yml
@@ -3,7 +3,7 @@
 - name: Install backup software
   apt:
     name: "{{ item }}"
-    state: installed
+    state: present
   with_items:
     - duplicity
     - duply