pep8 compliance of test scripts

Author: DominiqueDevinci

tests/bindings/python/benchmark_import_results.py

@@ -26,19 +26,19 @@
         print(rs.get_idref(), result2str(rs.get_result()))
 
         if (rs.get_idref() == "R-SHOULD_PASS" and
-           rs.get_result() != oscap.xccdf.XCCDF_RESULT_PASS):
-            
+                rs.get_result() != oscap.xccdf.XCCDF_RESULT_PASS):
+
             raise Exception("Rule result for {0} should be PASS but is currently {1}."
                             .format(rs.get_idref(),
                                     result2str(rs.get_result())))
-                                    
+
         elif (rs.get_idref() == "R-SHOULD_FAIL" and
-             rs.get_result() != oscap.xccdf.XCCDF_RESULT_FAIL):
-                 
+              rs.get_result() != oscap.xccdf.XCCDF_RESULT_FAIL):
+
             raise Exception("Rule result for {0} should be FAIL but is currently {1}."
                             .format(rs.get_idref(),
                                     result2str(rs.get_result())))
-                 
+
 
 # Now ensure that benchmark_import return None if the file doesn't exists
 

tests/bindings/python/introspection_features.py

@@ -8,41 +8,41 @@
 #    - Test the presence or the absence of expected builtins functions
 #    - Indentify a constant name by its value and prefix (prefix XCCDF_RESULT
 #       with value 1 (usually) should identify XCCDF_RESULT_PASS
-#    - Check presence of constants filtered by a prefix (XCCDF_RESULT with 
+#    - Check presence of constants filtered by a prefix (XCCDF_RESULT with
 #       value = None should returns all XCCDF_RESULT_* constants).
 #
 
 
 from import_handler import oscap
 from pprint import pprint
 
-oval_funcs=oscap.oval.introspect()
+oval_funcs = oscap.oval.introspect()
 
 if oval_funcs.get('oval_variable_get_values') is None:
     raise Exception("method 'oval_variable_get_values' not found in builtins"
                     "functions of oval object (should be in oscap.oval.introspect())")
 
-if  oval_funcs.get('xccdf_check_get_id') is not None:
+if oval_funcs.get('xccdf_check_get_id') is not None:
     raise Exception("method 'xccdf_check_get_id' should not be found in "
                     "oscap.oval.introspect(), because the prefix isn't 'oval')")
 
-if oscap.oval.introspect_all().get('xccdf_check_get_id') is None:    
-     raise Exception("method 'xccdf_check_get_id' should be present in "
-     "oscap.oval.introspect_all(), which returns all available builtins functions")
-                    
+if oscap.oval.introspect_all().get('xccdf_check_get_id') is None:
+    raise Exception("method 'xccdf_check_get_id' should be present in "
+                    "oscap.oval.introspect_all(), which returns all available builtins functions")
+
 print("Introspection of builtins functions seems working.")
 
 
 # should returns {'XCCDF_RESULT_PASS': 1}
 # but it's not impossible that the numeric value change (in fact we don't care of it)
-pass_val=oscap.oval.XCCDF_RESULT_PASS  # is usually 1
+pass_val = oscap.oval.XCCDF_RESULT_PASS  # is usually 1
 
-var1=oscap.oval.introspect_constants(pass_val, "XCCDF_RESULT")
-if len(var1) == 1 and list(var1.keys())[0]=="XCCDF_RESULT_PASS":
-    print("Introspection of oscap.oval.XCCDF_RESULT_PASS ok");
+var1 = oscap.oval.introspect_constants(pass_val, "XCCDF_RESULT")
+if len(var1) == 1 and list(var1.keys())[0] == "XCCDF_RESULT_PASS":
+    print("Introspection of oscap.oval.XCCDF_RESULT_PASS ok")
 
 
-xccdf_results=oscap.oval.introspect_constants(None, "XCCDF_RESULT")
+xccdf_results = oscap.oval.introspect_constants(None, "XCCDF_RESULT")
 # should returns something like {
 # 'XCCDF_RESULT_ERROR': 3,
 # 'XCCDF_RESULT_FAIL': 2,
@@ -55,7 +55,7 @@
 # 'XCCDF_RESULT_UNKNOWN': 4}
 
 expected_constants = ('XCCDF_RESULT_ERROR', 'XCCDF_RESULT_FAIL', 'XCCDF_RESULT_FIXED',
-                      'XCCDF_RESULT_INFORMATIONAL', 'XCCDF_RESULT_NOT_APPLICABLE', 
+                      'XCCDF_RESULT_INFORMATIONAL', 'XCCDF_RESULT_NOT_APPLICABLE',
                       'XCCDF_RESULT_NOT_CHECKED', 'XCCDF_RESULT_PASS',
                       'XCCDF_RESULT_NOT_SELECTED', 'XCCDF_RESULT_UNKNOWN')
 
@@ -64,4 +64,4 @@
         raise Exception("oscap.oval.introspect_constants(None, 'XCCDF_RESULT) should"
                         "contains the constant {0}.".format(c))
 
-print("Introspection of constants ok with prefix XCCDF_RESULT_*");
+print("Introspection of constants ok with prefix XCCDF_RESULT_*")

tests/bindings/python/oval_helpers.py

@@ -9,6 +9,7 @@
 #   to provide convenience utilities.
 #
 
+
 def browse_criteria(crit_node, mode=0):
     '''
     Browse recursively criteria of an oval test and build a representation of it