1 files changed, 35 insertions, 8 deletions
diff --git a/roles/openshift_health_checker/test/memory_availability_test.py b/roles/openshift_health_checker/test/memory_availability_test.py
index e161a5b9e..1db203854 100644
--- a/roles/openshift_health_checker/test/memory_availability_test.py
+++ b/roles/openshift_health_checker/test/memory_availability_test.py
@@ -20,27 +20,37 @@ def test_is_active(group_names, is_active):
     assert MemoryAvailability.is_active(task_vars=task_vars) == is_active
 
 
-@pytest.mark.parametrize('group_names,ansible_memtotal_mb', [
+@pytest.mark.parametrize('group_names,configured_min,ansible_memtotal_mb', [
     (
         ['masters'],
+        0,
         17200,
     ),
     (
         ['nodes'],
+        0,
         8200,
     ),
     (
+        ['nodes'],
+        1,  # configure lower threshold
+        2000,  # too low for recommended but not for configured
+    ),
+    (
         ['etcd'],
-        22200,
+        0,
+        8200,
     ),
     (
         ['masters', 'nodes'],
+        0,
         17000,
     ),
 ])
-def test_succeeds_with_recommended_memory(group_names, ansible_memtotal_mb):
+def test_succeeds_with_recommended_memory(group_names, configured_min, ansible_memtotal_mb):
     task_vars = dict(
         group_names=group_names,
+        openshift_check_min_host_memory_gb=configured_min,
         ansible_memtotal_mb=ansible_memtotal_mb,
     )
 
@@ -50,39 +60,56 @@ def test_succeeds_with_recommended_memory(group_names, ansible_memtotal_mb):
     assert not result.get('failed', False)
 
 
-@pytest.mark.parametrize('group_names,ansible_memtotal_mb,extra_words', [
+@pytest.mark.parametrize('group_names,configured_min,ansible_memtotal_mb,extra_words', [
     (
         ['masters'],
         0,
+        0,
         ['0.0 GB'],
     ),
     (
         ['nodes'],
+        0,
         100,
         ['0.1 GB'],
     ),
     (
+        ['nodes'],
+        24,  # configure higher threshold
+        20000,  # enough to meet recommended but not configured
+        ['20.0 GB'],
+    ),
+    (
         ['etcd'],
-        -1,
-        ['0.0 GB'],
+        0,
+        7000,
+        ['7.0 GB'],
+    ),
+    (
+        ['etcd', 'masters'],
+        0,
+        9000,  # enough memory for etcd, not enough for a master
+        ['9.0 GB'],
     ),
     (
         ['nodes', 'masters'],
+        0,
         # enough memory for a node, not enough for a master
         11000,
         ['11.0 GB'],
     ),
 ])
-def test_fails_with_insufficient_memory(group_names, ansible_memtotal_mb, extra_words):
+def test_fails_with_insufficient_memory(group_names, configured_min, ansible_memtotal_mb, extra_words):
     task_vars = dict(
         group_names=group_names,
+        openshift_check_min_host_memory_gb=configured_min,
         ansible_memtotal_mb=ansible_memtotal_mb,
     )
 
     check = MemoryAvailability(execute_module=fake_execute_module)
     result = check.run(tmp=None, task_vars=task_vars)
 
-    assert result['failed']
+    assert result.get('failed', False)
     for word in 'below recommended'.split() + extra_words:
         assert word in result['msg']