tests: do not call function twice

Signed-off-by: Giuseppe Scrivano <[email protected]>

Author: giuseppe

tests/test_mempolicy.py

@@ -35,11 +35,13 @@ def check_mempolicy_prerequisites(need_interleave=False):
     if need_interleave and not check_numa_interleave():
         logger.info("interleave missing")
         return (77, "NUMA interleave not supported")
+    return 0
 
 def test_mempolicy_no_conf():
     """Test numa mempolicy without configuration"""
-    if check_mempolicy_prerequisites():
-        return check_mempolicy_prerequisites()
+    prereq_result = check_mempolicy_prerequisites()
+    if prereq_result != 0:
+        return prereq_result
 
     conf = base_config()
     conf['process']['args'] = ['/init', 'cat', '/proc/self/numa_maps']
@@ -61,8 +63,9 @@ def test_mempolicy_no_conf():
 
 def test_mempolicy_bad_mode():
     """Test numa mempolicy with bad mode"""
-    if check_mempolicy_prerequisites():
-        return check_mempolicy_prerequisites()
+    prereq_result = check_mempolicy_prerequisites()
+    if prereq_result != 0:
+        return prereq_result
 
     conf = base_config()
     conf['process']['args'] = ['/init', 'cat', '/proc/self/numa_maps']
@@ -84,8 +87,9 @@ def test_mempolicy_bad_mode():
 
 def test_mempolicy_bad_flag():
     """Test numa mempolicy with bad flag"""
-    if check_mempolicy_prerequisites():
-        return check_mempolicy_prerequisites()
+    prereq_result = check_mempolicy_prerequisites()
+    if prereq_result != 0:
+        return prereq_result
 
     conf = base_config()
     conf['process']['args'] = ['/init', 'cat', '/proc/self/numa_maps']
@@ -107,8 +111,9 @@ def test_mempolicy_bad_flag():
 
 def test_mempolicy_numa_balancing_flag():
     """Test numa mempolicy preferred with numa_balancing flag"""
-    if check_mempolicy_prerequisites(need_interleave=True):
-        return check_mempolicy_prerequisites(need_interleave=True)
+    prereq_result = check_mempolicy_prerequisites(need_interleave=True)
+    if prereq_result != 0:
+        return prereq_result
 
     conf = base_config()
     conf['process']['args'] = ['/init', 'cat', '/proc/self/numa_maps']
@@ -130,8 +135,9 @@ def test_mempolicy_numa_balancing_flag():
 
 def test_mempolicy_static_relative_nodes_flags():
     """Test numa mempolicy preferred with numa_balancing flag"""
-    if check_mempolicy_prerequisites():
-        return check_mempolicy_prerequisites()
+    prereq_result = check_mempolicy_prerequisites()
+    if prereq_result != 0:
+        return prereq_result
 
     conf = base_config()
     conf['process']['args'] = ['/init', 'cat', '/proc/self/numa_maps']
@@ -153,8 +159,9 @@ def test_mempolicy_static_relative_nodes_flags():
 
 def test_mempolicy_no_nodes():
     """Test numa mempolicy without nodes configuration"""
-    if check_mempolicy_prerequisites():
-        return check_mempolicy_prerequisites()
+    prereq_result = check_mempolicy_prerequisites()
+    if prereq_result != 0:
+        return prereq_result
 
     conf = base_config()
     conf['process']['args'] = ['/init', 'cat', '/proc/self/numa_maps']
@@ -176,8 +183,9 @@ def test_mempolicy_no_nodes():
 
 def test_mempolicy_bad_nodes_string():
     """Test numa mempolicy without nodes configuration"""
-    if check_mempolicy_prerequisites():
-        return check_mempolicy_prerequisites()
+    prereq_result = check_mempolicy_prerequisites()
+    if prereq_result != 0:
+        return prereq_result
 
     conf = base_config()
     conf['process']['args'] = ['/init', 'cat', '/proc/self/numa_maps']
@@ -199,8 +207,9 @@ def test_mempolicy_bad_nodes_string():
 
 def test_mempolicy_bad_nodes_number():
     """Test numa mempolicy without nodes configuration"""
-    if check_mempolicy_prerequisites():
-        return check_mempolicy_prerequisites()
+    prereq_result = check_mempolicy_prerequisites()
+    if prereq_result != 0:
+        return prereq_result
 
     conf = base_config()
     conf['process']['args'] = ['/init', 'cat', '/proc/self/numa_maps']
@@ -222,8 +231,9 @@ def test_mempolicy_bad_nodes_number():
 
 def test_mempolicy_default_mode():
     """Test numa mempolicy default mode"""
-    if check_mempolicy_prerequisites():
-        return check_mempolicy_prerequisites()
+    prereq_result = check_mempolicy_prerequisites()
+    if prereq_result != 0:
+        return prereq_result
 
     conf = base_config()
     conf['process']['args'] = ['/init', 'cat', '/proc/self/numa_maps']
@@ -248,8 +258,9 @@ def test_mempolicy_default_mode():
 
 def test_mempolicy_local_mode():
     """Test numa mempolicy local mode"""
-    if check_mempolicy_prerequisites():
-        return check_mempolicy_prerequisites()
+    prereq_result = check_mempolicy_prerequisites()
+    if prereq_result != 0:
+        return prereq_result
 
     conf = base_config()
     conf['process']['args'] = ['/init', 'cat', '/proc/self/numa_maps']
@@ -274,8 +285,9 @@ def test_mempolicy_local_mode():
 
 def test_mempolicy_bind_mode():
     """Test numa mempolicy bind mode"""
-    if check_mempolicy_prerequisites():
-        return check_mempolicy_prerequisites()
+    prereq_result = check_mempolicy_prerequisites()
+    if prereq_result != 0:
+        return prereq_result
 
     conf = base_config()
     conf['process']['args'] = ['/init', 'cat', '/proc/self/numa_maps']
@@ -300,8 +312,9 @@ def test_mempolicy_bind_mode():
 
 def test_mempolicy_bind_mode_balancing():
     """Test numa mempolicy bind mode balancing"""
-    if check_mempolicy_prerequisites(need_interleave=True):
-        return check_mempolicy_prerequisites(need_interleave=True)
+    prereq_result = check_mempolicy_prerequisites(need_interleave=True)
+    if prereq_result != 0:
+        return prereq_result
 
     conf = base_config()
     conf['process']['args'] = ['/init', 'cat', '/proc/self/numa_maps']
@@ -326,8 +339,9 @@ def test_mempolicy_bind_mode_balancing():
 
 def test_mempolicy_bind_mode_balancing_relative():
     """Test numa mempolicy bind mode balancing with relative nodes"""
-    if check_mempolicy_prerequisites(need_interleave=True):
-        return check_mempolicy_prerequisites(need_interleave=True)
+    prereq_result = check_mempolicy_prerequisites(need_interleave=True)
+    if prereq_result != 0:
+        return prereq_result
 
     conf = base_config()
     conf['process']['args'] = ['/init', 'cat', '/proc/self/numa_maps']
@@ -352,8 +366,9 @@ def test_mempolicy_bind_mode_balancing_relative():
 
 def test_mempolicy_preferred_mode_static():
     """Test numa mempolicy preferred mode with static nodes"""
-    if check_mempolicy_prerequisites():
-        return check_mempolicy_prerequisites()
+    prereq_result = check_mempolicy_prerequisites()
+    if prereq_result != 0:
+        return prereq_result
 
     conf = base_config()
     conf['process']['args'] = ['/init', 'cat', '/proc/self/numa_maps']
@@ -378,8 +393,9 @@ def test_mempolicy_preferred_mode_static():
 
 def test_mempolicy_preferred_many_mode():
     """Test numa mempolicy preferred many mode with all nodes"""
-    if check_mempolicy_prerequisites():
-        return check_mempolicy_prerequisites()
+    prereq_result = check_mempolicy_prerequisites()
+    if prereq_result != 0:
+        return prereq_result
 
     conf = base_config()
     conf['process']['args'] = ['/init', 'cat', '/proc/self/numa_maps']
@@ -404,8 +420,9 @@ def test_mempolicy_preferred_many_mode():
 
 def test_mempolicy_interleave_mode():
     """Test numa mempolicy interleave mode"""
-    if check_mempolicy_prerequisites():
-        return check_mempolicy_prerequisites()
+    prereq_result = check_mempolicy_prerequisites()
+    if prereq_result != 0:
+        return prereq_result
 
     conf = base_config()
     conf['process']['args'] = ['/init', 'cat', '/proc/self/numa_maps']
@@ -430,8 +447,9 @@ def test_mempolicy_interleave_mode():
 
 def test_mempolicy_weighted_interleave_mode():
     """Test numa mempolicy weighted interleave mode"""
-    if check_mempolicy_prerequisites(need_interleave=True):
-        return check_mempolicy_prerequisites(need_interleave=True)
+    prereq_result = check_mempolicy_prerequisites(need_interleave=True)
+    if prereq_result != 0:
+        return prereq_result
 
     conf = base_config()
     conf['process']['args'] = ['/init', 'cat', '/proc/self/numa_maps']