Various small changes for molecule

molecule/default/tests/test_default.py

@@ -6,15 +6,15 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
     os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('telegraf')
 
 
-def test_telegraf_running_and_enabled(Service, SystemInfo):
-    telegraf = Service("telegraf")
-    if SystemInfo.distribution not in ['opensuse-leap']:
+def test_telegraf_running_and_enabled(host):
+    telegraf = host.service("telegraf")
+    if host.system_info.distribution not in ['opensuse-leap']:
         assert telegraf.is_enabled
         assert telegraf.is_running
 
 
-def test_telegraf_dot_conf(File):
-    telegraf = File("/etc/telegraf/telegraf.conf")
+def test_telegraf_dot_conf(host):
+    telegraf = host.file("/etc/telegraf/telegraf.conf")
     assert telegraf.user == "telegraf"
     assert telegraf.group == "telegraf"
     assert telegraf.mode == 0o640
@@ -26,16 +26,16 @@ def test_telegraf_dot_conf(File):
     assert telegraf.contains('[[inputs.net]]')
 
 
-def test_telegraf_dot_d_dir(File):
-    telegraf = File("/etc/telegraf/telegraf.d")
+def test_telegraf_dot_d_dir(host):
+    telegraf = host.file("/etc/telegraf/telegraf.d")
     assert telegraf.user == "root"
     assert telegraf.group == "root"
     assert telegraf.mode == 0o755
     assert telegraf.is_directory
 
 
-def test_telegraf_dot_d(File):
-    telegraf = File("/etc/telegraf/telegraf.d/percpu-usage.conf")
+def test_telegraf_dot_d(host):
+    telegraf = host.file("/etc/telegraf/telegraf.d/percpu-usage.conf")
     assert telegraf.user == "telegraf"
     assert telegraf.group == "telegraf"
     assert telegraf.mode == 0o640
@@ -43,6 +43,6 @@ def test_telegraf_dot_d(File):
     assert telegraf.contains('totalcpu = false')
 
 
-def test_telegraf_package(Package):
-    telegraf = Package('telegraf')
+def test_telegraf_package(host):
+    telegraf = host.package('telegraf')
     assert telegraf.is_installed