fix: Fixed tests

Author: dploeger

requirements-tests.txt

@@ -1,5 +1,5 @@
 pytest_docker_tools==0.2.0
-pytest==5.4.1
+pytest==6.2.5
 pytest-cov==2.8.1
 pytest-twisted==1.12
 flake8>=3.6.0

tests/unit/test_vmware_exporter.py

@@ -62,6 +62,7 @@ def test_collect_vms():
         'datastores': True,
         'hosts': True,
         'snapshots': True,
+        'volumes': False,
     }
 
     # Test runtime.host not found
@@ -362,6 +363,7 @@ def test_metrics_without_hostaccess():
         'datastores': False,
         'hosts': False,
         'snapshots': False,
+        'volumes': False,
     }
 
     collector = VmwareCollector(
@@ -510,6 +512,7 @@ def test_collect_vm_perf():
         'datastores': True,
         'hosts': True,
         'snapshots': True,
+        'volumes': False,
     }
     collector = VmwareCollector(
         '127.0.0.1',
@@ -630,6 +633,7 @@ def test_collect_hosts():
         'datastores': True,
         'hosts': True,
         'snapshots': True,
+        'volumes': False,
     }
     collector = VmwareCollector(
         '127.0.0.1',
@@ -991,6 +995,7 @@ def test_collect_host_perf():
         'datastores': False,
         'hosts': True,
         'snapshots': False,
+        'volumes': False,
     }
     collector = VmwareCollector(
         '127.0.0.1',
@@ -1105,6 +1110,7 @@ def test_collect_datastore():
         'datastores': True,
         'hosts': True,
         'snapshots': True,
+        'volumes': False,
     }
     collector = VmwareCollector(
         '127.0.0.1',
@@ -1206,6 +1212,7 @@ def test_collect():
         'datastores': True,
         'hosts': True,
         'snapshots': True,
+        'volumes': False,
     }
     collector = VmwareCollector(
         '127.0.0.1',
@@ -1242,6 +1249,7 @@ def test_collect_deferred_error_works():
         'datastores': True,
         'hosts': True,
         'snapshots': True,
+        'volumes': False,
     }
     collector = VmwareCollector(
         '127.0.0.1',
@@ -1344,6 +1352,7 @@ def test_vmware_get_inventory():
         'datastores': True,
         'hosts': True,
         'snapshots': True,
+        'volumes': False,
     }
     collector = VmwareCollector(
         '127.0.0.1',
@@ -1388,6 +1397,7 @@ def test_vmware_connect():
         'datastores': True,
         'hosts': True,
         'snapshots': True,
+        'volumes': False,
     }
     collector = VmwareCollector(
         '127.0.0.1',
@@ -1416,6 +1426,7 @@ def test_vmware_disconnect():
         'datastores': True,
         'hosts': True,
         'snapshots': True,
+        'volumes': False,
     }
     collector = VmwareCollector(
         '127.0.0.1',
@@ -1451,6 +1462,7 @@ def test_counter_ids():
         'datastores': True,
         'hosts': True,
         'snapshots': True,
+        'volumes': False,
     }
     collector = VmwareCollector(
         '127.0.0.1',
@@ -1607,6 +1619,7 @@ def test_vmware_resource_async_render_GET_section():
                 'snapshots': True,
                 'vmguests': True,
                 'vms': True,
+                'volumes': False,
             }
         },
         'mysection': {
@@ -1624,6 +1637,7 @@ def test_vmware_resource_async_render_GET_section():
                 'snapshots': True,
                 'vmguests': True,
                 'vms': True,
+                'volumes': False,
             }
         }
     }
@@ -1686,6 +1700,7 @@ def test_config_env_multiple_sections():
                 'snapshots': True,
                 'vmguests': True,
                 'vms': True,
+                'volumes': False,
             }
         },
         'mysection': {
@@ -1703,6 +1718,7 @@ def test_config_env_multiple_sections():
                 'snapshots': True,
                 'vmguests': True,
                 'vms': True,
+                'volumes': False,
             }
         }
     }

vmware_exporter/helpers.py

@@ -5,7 +5,7 @@
 
 def get_bool_env(key: str, default: bool):
     value = os.environ.get(key, default)
-    return value if value is bool else value.lower() == 'true'
+    return value if type(value) is bool else value.lower() == 'true'
 
 
 def batch_fetch_properties(content, obj_type, properties):