minor corrections (change requests)

Author: DominiqueDevinci

swig/openscap_api.py

@@ -242,7 +242,7 @@ def introspect_all(self):
         """ Listing all builtin functions accessible through SWIG """
         return OSCAP.__dict__
 
-    def introspect(self):
+    def introspect_functions(self):
         ''' Returns all builtin function accessible through SWIG
             which is corresponding to the current object
         '''
@@ -292,7 +292,7 @@ def __getattr__(self, name):
             except:
                 return self.__func_wrapper(obj)
 
-        """ Looking if it's can be a constructor """
+        """ Looking if it can be a constructor """
         obj = OSCAP.__dict__.get(self.object + "_" + name + "_new")
         if obj is not None:
             # this will call the __call__ definition of OSCAP_Object

tests/bindings/python/benchmark_import_results.py

@@ -23,21 +23,22 @@
     print(test_result.get_id())
 
     for rs in test_result.get_rule_results():
-        print(rs.get_idref(), result2str(rs.get_result()))
+        idref, result = rs.get_idref(), rs.get_result()
+        print(idref, result2str(result))
 
-        if (rs.get_idref() == "R-SHOULD_PASS" and
-                rs.get_result() != oscap.xccdf.XCCDF_RESULT_PASS):
+        if (idref == "R-SHOULD_PASS" and
+                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())))
+                            .format(idref,
+                                    result2str(result)))
 
-        elif (rs.get_idref() == "R-SHOULD_FAIL" and
-              rs.get_result() != oscap.xccdf.XCCDF_RESULT_FAIL):
+        elif (idref == "R-SHOULD_FAIL" and
+              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())))
+                            .format(idref,
+                                    result2str(result)))
 
 
 # Now ensure that benchmark_import return None if the file doesn't exists

tests/bindings/python/import_handler.py

@@ -53,7 +53,7 @@ def result2str(result):
 
 '''
 Return the absolute path of a relative path (located in this folder)
-Required because the tests are runned from the build directory,
+Required because the tests are run from the build directory,
 so you need to use this functions for all relative paths.
 '''
 

tests/bindings/python/introspection_features.py

@@ -4,7 +4,7 @@
 #   Dominique Blaze <[email protected]>
 #
 # Description:
-#   Test introspection features of python the api
+#   Test introspection features of Python API
 #    - 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
@@ -16,15 +16,15 @@
 from import_handler import oscap
 from pprint import pprint
 
-oval_funcs = oscap.oval.introspect()
+oval_funcs = oscap.oval.introspect_functions()
 
 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())")
+                    "functions of oval object (should be in oscap.oval.introspect_functions())")
 
 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')")
+                    "oscap.oval.introspect_functions(), 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 "

tests/bindings/python/oval_eval.py

@@ -46,7 +46,7 @@
 # if you return something in callback else than 0, the current session stops
 def oval_sample_callback(ovdef, usr):
     # .eval or .get_result return the same thing
-    print(ovdef.get_id()+" => "+result2str(ovdef.get_result()))
+    print(ovdef.get_id() + " => " + result2str(ovdef.get_result()))
 
     # retrieve the tests tree and replace test_results by [subtype => result]
     tests_tree = browse_criteria(ovdef.get_criteria(), 1)

tests/bindings/python/oval_helpers.py

@@ -9,6 +9,8 @@
 #   to provide convenience utilities.
 #
 
+from import_handler import oscap
+
 
 def browse_criteria(crit_node, mode=0):
     '''

tests/bindings/python/samples/oval_sample.xml

@@ -34,12 +34,12 @@
   </definitions>
 
   <tests>
-    <ind:textfilecontent54_test id="oval:foo_pass:tst:1" version="1" comment="File /tmp/foo_python.txt must contains at least one 'Hello'"  check="at least one">
+    <ind:textfilecontent54_test id="oval:foo_pass:tst:1" version="1" comment="File /tmp/foo_python.txt must contain at least one 'Hello'"  check="at least one">
       <ind:object object_ref="oval:foo:obj:1"/>
       <ind:state state_ref="oval:foo_pass:ste:1"/>
     </ind:textfilecontent54_test>
 
-    <ind:textfilecontent54_test id="oval:foo_fail:tst:1" version="1" comment="File /tmp/foo_python.txt must not contains 'Hello'"  check="all">
+    <ind:textfilecontent54_test id="oval:foo_fail:tst:1" version="1" comment="File /tmp/foo_python.txt must not contain 'Hello'"  check="all">
       <ind:object object_ref="oval:foo:obj:1"/>
       <ind:state state_ref="oval:foo_fail:ste:1"/>
     </ind:textfilecontent54_test>

tests/bindings/python/xccdf_policy.py

@@ -61,7 +61,7 @@
 benchmark = pm.get_benchmark()
 expected_benchmark_id = "xccdf_com.example.www_benchmark_test"
 if benchmark.get_id() != expected_benchmark_id:
-    raise Exception("Benchmark id should be {0} but is currently {0}"
+    raise Exception("Benchmark id should be {0} but is currently {1}"
                     .format(expected_benchmark_id, benchmark.get_id()))
 
 print("Browsing profiles ...")

tests/bindings/test_python.sh

@@ -38,4 +38,6 @@ if [ -z ${CUSTOM_OSCAP+x} ] ; then
     test_run "python_xccdf_policy" run_pyfile xccdf_policy.py
 fi
 
+rm /tmp/foo_python.txt
+
 test_exit