Update tests to follow the updated return codes

- remove preupg_diff part of the test XMLs so the inplace_risks tests work as expected - update preupg_diff tests to still provide value
upgrades-migrations · Nov 22, 2017 · bdbff7c · bdbff7c
1 parent 5aa0cf8
commit bdbff7c
Show file tree

Hide file tree

Showing 6 changed files with 130 additions and 229 deletions.
diff --git a/preupg/report_parser.py b/preupg/report_parser.py
@@ -147,34 +147,6 @@ def modify_result_path(self, result_dir, scenario, mode):
 
         self.write_xml()
 
-<<<<<<< HEAD
-    def update_inplace_risk(self, scanning_progress, rule, res):
-        """Function updates inplace risk"""
-        inplace_risk = XccdfHelper.get_check_import_inplace_risk(rule)
-        if inplace_risk:
-            logger_report.debug("Update_inplace_risk '%s'", inplace_risk)
-            return_value = XccdfHelper.get_and_print_inplace_risk(0, inplace_risk)
-            logger_report.debug("Get and print inplace risk return code '%s'", return_value)
-            if int(return_value)/2 == 1:
-                res.text = ReportHelper.get_needs_inspection()
-            elif int(return_value)/2 == 2:
-                res.text = ReportHelper.get_needs_action()
-            for index, row in enumerate(scanning_progress.output_data):
-                if self.get_nodes_text(rule, "title") in row:
-                    scanning_progress.output_data[index] = "{0}:{1}".format(
-                        self.get_nodes_text(rule, "title"),
-                        res.text)
-=======
-    def modify_platform_tag(self, platform_tag):
-        """The function updates platform tag to the assessment system tag"""
-        for platform in self.filter_children(self.target_tree, "platform"):
-            if "cpe:/o:redhat:enterprise_linux:" in platform.get("idref"):
-                logger_report.debug("Update platform tag to '%s'", platform_tag)
-                platform.set("idref", "cpe:/o:redhat:enterprise_linux:"+platform_tag)
-
-        self.write_xml()
->>>>>>> Refactor functions determining the return code
-
     def replace_inplace_risk(self, scanning_results=None):
         """Replace result of a module:
         - from FAIL to NEEDS_INSPECTION if the module has SLIGHT or MEDIUM risk

diff --git a/tests/__init__.py b/tests/__init__.py
@@ -9,16 +9,12 @@
 os.environ['CURRENT_DIRECTORY'] = dirname
 os.environ['XCCDF_VALUE_REPORT_DIR'] = dirname
 os.environ['XCCDF_VALUE_CURRENT_DIRECTORY'] = os.path.join(os.path.dirname(__file__), "..")
-os.environ['XCCDF_RESULT_ERROR'] = "3"
-os.environ['XCCDF_RESULT_FAILED'] = "2"
-os.environ['XCCDF_RESULT_FAIL'] = "2"
-os.environ['XCCDF_RESULT_FIXED'] = "1"
-os.environ['XCCDF_RESULT_NEEDS_INSPECTION'] = "1"
-os.environ['XCCDF_RESULT_NEEDS_ACTION'] = "1"
-os.environ['XCCDF_RESULT_NOT_APPLICABLE'] = "10"
+os.environ['XCCDF_RESULT_FAIL'] = "102"
+os.environ['XCCDF_RESULT_ERROR'] = "103"
+os.environ['XCCDF_RESULT_FIXED'] = "109"
+os.environ['XCCDF_RESULT_NOT_APPLICABLE'] = "105"
 os.environ['XCCDF_VALUE_MODULE_PATH'] = "test_script_api"
 
-
 def suite():
     settings.log_dir = os.getcwd()
     settings.preupg_log = os.path.join(settings.log_dir, "preupg.log")

diff --git a/tests/generated_results/inplace_combined_risk_test.xml b/tests/generated_results/inplace_combined_risk_test.xml
@@ -30,7 +30,6 @@
     </ns0:description>
     <ns0:select idref="xccdf_preupg_rule_dummy_preupg_dummy1" selected="true" />
     <ns0:select idref="xccdf_preupg_rule_dummy_preupg_dummy2" selected="true" />
-    <ns0:select idref="xccdf_preupg_rule_dummy_preupg_diff" selected="true" />
   </ns0:Profile>
   <ns0:Value id="xccdf_preupg_value_tmp_preupgrade" type="string">
     <ns0:value>/root/preupgrade</ns0:value>
@@ -72,7 +71,7 @@
         Dummy content
 
       </ns0:description>
-        <ns0:fixtext xml:lang="en">Dummy content</ns0:fixtext>
+        <ns0:fixtext xml:lang="en">Dummy content solution</ns0:fixtext>
         <ns0:check system="http://open-scap.org/page/SCE">
           <ns0:check-import import-name="stdout">
           </ns0:check-import>
@@ -132,33 +131,6 @@
         </ns0:check>
       </ns0:Rule>
     </ns0:Group>
-    <ns0:Group id="xccdf_preupg_group_dummy_preupg_diff" selected="true">
-      <ns0:title xml:lang="en">Dummy content</ns0:title>
-      <ns0:Rule id="xccdf_preupg_rule_dummy_preupg_diff" selected="true">
-        <ns0:title xml:lang="en">Dummy content</ns0:title>
-        <ns0:description xml:lang="en">
-        Dummy content
-      </ns0:description>
-        <ns0:fixtext xml:lang="en">str1<br />str2</ns0:fixtext>
-        <ns0:check system="http://open-scap.org/page/SCE">
-          <ns0:check-import import-name="stdout">
-          </ns0:check-import>
-          <ns0:check-import import-name="stderr">
-          </ns0:check-import>
-          <ns0:check-export export-name="MODULE_NAME" value-id="xccdf_preupg_value_dummy_preupg_dummy1_state_module_name" />
-          <ns0:check-export export-name="RESULT_PART" value-id="xccdf_preupg_value_dummy_preupg_dummy1_state_result_part" />
-          <ns0:check-export export-name="CURRENT_DIRECTORY" value-id="xccdf_preupg_value_dummy_preupg_dummy1_state_current_directory" />
-          <ns0:check-export export-name="SOLUTION_FILE" value-id="xccdf_preupg_value_dummy_preupg_dummy1_state_solution_file" />
-          <ns0:check-export export-name="REPORT_DIR" value-id="xccdf_preupg_value_report_dir" />
-          <ns0:check-export export-name="UPGRADE" value-id="xccdf_preupg_value_upgrade" />
-          <ns0:check-export export-name="MIGRATE" value-id="xccdf_preupg_value_migrate" />
-          <ns0:check-export export-name="DIST_NATIVE" value-id="xccdf_preupg_value_dist_native" />
-          <ns0:check-export export-name="DEVEL_MODE" value-id="xccdf_preupg_value_devel_mode" />
-          <ns0:check-export export-name="TMP_PREUPGRADE" value-id="xccdf_preupg_value_tmp_preupgrade" />
-          <ns0:check-content-ref href="dummy/preupg/dummy.sh" />
-        </ns0:check>
-      </ns0:Rule>
-    </ns0:Group>
   </ns0:Group>
   <ns0:TestResult end-time="2016-08-24T17:43:45" id="xccdf_org.open-scap_testresult_xccdf_preupg_profile_default" start-time="2016-08-24T17:39:07" version="1.0">
     <ns0:benchmark href="/root/preupgrade/FOOBAR6_7/all-xccdf.xml" id="xccdf_preupg-content_benchmark_all" />
@@ -229,24 +201,6 @@
         <ns0:check-content-ref href="dummy/preupg/dummy.sh" />
       </ns0:check>
     </ns0:rule-result>
-    <ns0:rule-result idref="xccdf_preupg_rule_dummy_preupg_diff" time="2016-08-24T17:39:11" weight="1.000000">
-      <ns0:result>dummy_result</ns0:result>
-      <ns0:check system="http://open-scap.org/page/SCE">
-        <ns0:check-import import-name="stdout">sample output</ns0:check-import>
-        <ns0:check-import import-name="stderr"></ns0:check-import>
-        <ns0:check-export export-name="MODULE_NAME" value-id="xccdf_preupg_value_dummy_preupg_dummy2_state_module_name" />
-        <ns0:check-export export-name="RESULT_PART" value-id="xccdf_preupg_value_dummy_preupg_dummy2_state_result_part" />
-        <ns0:check-export export-name="CURRENT_DIRECTORY" value-id="xccdf_preupg_value_dummy_preupg_dummy2_state_current_directory" />
-        <ns0:check-export export-name="SOLUTION_FILE" value-id="xccdf_preupg_value_dummy_preupg_dummy2_state_solution_file" />
-        <ns0:check-export export-name="REPORT_DIR" value-id="xccdf_preupg_value_report_dir" />
-        <ns0:check-export export-name="UPGRADE" value-id="xccdf_preupg_value_upgrade" />
-        <ns0:check-export export-name="MIGRATE" value-id="xccdf_preupg_value_migrate" />
-        <ns0:check-export export-name="DIST_NATIVE" value-id="xccdf_preupg_value_dist_native" />
-        <ns0:check-export export-name="DEVEL_MODE" value-id="xccdf_preupg_value_devel_mode" />
-        <ns0:check-export export-name="TMP_PREUPGRADE" value-id="xccdf_preupg_value_tmp_preupgrade" />
-        <ns0:check-content-ref href="dummy/preupg/dummy.sh" />
-      </ns0:check>
-    </ns0:rule-result>
     <ns0:score maximum="100.000000" system="urn:xccdf:scoring:default">49.081196</ns0:score>
     <ns0:score maximum="70.000000" system="urn:xccdf:scoring:flat">40.000000</ns0:score>
   </ns0:TestResult>

diff --git a/tests/generated_results/inplace_risk_test.xml b/tests/generated_results/inplace_risk_test.xml
@@ -28,8 +28,7 @@
         This profile is designed for the Preupgrade Assistant tool.
       </html:p>
     </ns0:description>
-    <ns0:select idref="xccdf_preupg_rule_dummy_preupg_dummy" selected="true" />
-    <ns0:select idref="xccdf_preupg_rule_dummy_preupg_diff" selected="true" />
+    <ns0:select idref="xccdf_preupg_rule_dummy_preupg_dummy1" selected="true" />
   </ns0:Profile>
   <ns0:Value id="xccdf_preupg_value_tmp_preupgrade" type="string">
     <ns0:value>/root/preupgrade</ns0:value>
@@ -51,54 +50,27 @@
   </ns0:Value>
   <ns0:Group id="xccdf_preupg_group_dummy" selected="true">
     <ns0:title xml:lang="en">DUMMY</ns0:title>
-    <ns0:Group id="xccdf_preupg_group_dummy_preupg" selected="true">
+    <ns0:Group id="xccdf_preupg_group_dummy_preupg1" selected="true">
       <ns0:title xml:lang="en">Dummy content</ns0:title>
-      <ns0:Value id="xccdf_preupg_value_dummy_preupg_dummy_state_module_name" operator="equals" type="string">
+      <ns0:Value id="xccdf_preupg_value_dummy_preupg_dummy1_state_module_name" operator="equals" type="string">
         <ns0:value>dummy_preupg</ns0:value>
       </ns0:Value>
-      <ns0:Value id="xccdf_preupg_value_dummy_preupg_dummy_state_result_part" operator="equals" type="string">
+      <ns0:Value id="xccdf_preupg_value_dummy_preupg_dummy1_state_result_part" operator="equals" type="string">
         <ns0:value>admin</ns0:value>
       </ns0:Value>
-      <ns0:Value id="xccdf_preupg_value_dummy_preupg_dummy_state_current_directory" operator="equals" type="string">
+      <ns0:Value id="xccdf_preupg_value_dummy_preupg_dummy1_state_current_directory" operator="equals" type="string">
         <ns0:value>/root/preupgrade/FOOBAR6_7/dummy/preupg</ns0:value>
       </ns0:Value>
-      <ns0:Value id="xccdf_preupg_value_dummy_preupg_dummy_state_solution_file" operator="equals" type="string">
+      <ns0:Value id="xccdf_preupg_value_dummy_preupg_dummy1_state_solution_file" operator="equals" type="string">
         <ns0:value>solution.txt</ns0:value>
       </ns0:Value>
-      <ns0:Rule id="xccdf_preupg_rule_dummy_preupg_dummy" selected="true">
+      <ns0:Rule id="xccdf_preupg_rule_dummy_preupg_dummy1" selected="true">
         <ns0:title xml:lang="en">Dummy content</ns0:title>
         <ns0:description xml:lang="en">
         Dummy content
 
       </ns0:description>
-        <ns0:fixtext xml:lang="en">Dummy content</ns0:fixtext>
-        <ns0:check system="http://open-scap.org/page/SCE">
-          <ns0:check-import import-name="stdout">
-          </ns0:check-import>
-          <ns0:check-import import-name="stderr">
-          </ns0:check-import>
-          <ns0:check-export export-name="MODULE_NAME" value-id="xccdf_preupg_value_dummy_preupg_dummy_state_module_name" />
-          <ns0:check-export export-name="RESULT_PART" value-id="xccdf_preupg_value_dummy_preupg_dummy_state_result_part" />
-          <ns0:check-export export-name="CURRENT_DIRECTORY" value-id="xccdf_preupg_value_dummy_preupg_dummy_state_current_directory" />
-          <ns0:check-export export-name="SOLUTION_FILE" value-id="xccdf_preupg_value_dummy_preupg_dummy_state_solution_file" />
-          <ns0:check-export export-name="REPORT_DIR" value-id="xccdf_preupg_value_report_dir" />
-          <ns0:check-export export-name="UPGRADE" value-id="xccdf_preupg_value_upgrade" />
-          <ns0:check-export export-name="MIGRATE" value-id="xccdf_preupg_value_migrate" />
-          <ns0:check-export export-name="DIST_NATIVE" value-id="xccdf_preupg_value_dist_native" />
-          <ns0:check-export export-name="DEVEL_MODE" value-id="xccdf_preupg_value_devel_mode" />
-          <ns0:check-export export-name="TMP_PREUPGRADE" value-id="xccdf_preupg_value_tmp_preupgrade" />
-          <ns0:check-content-ref href="dummy/preupg/dummy.sh" />
-        </ns0:check>
-      </ns0:Rule>
-    </ns0:Group>
-    <ns0:Group id="xccdf_preupg_group_dummy_preupg_diff" selected="true">
-      <ns0:title xml:lang="en">Dummy content</ns0:title>
-      <ns0:Rule id="xccdf_preupg_rule_dummy_preupg_diff" selected="true">
-        <ns0:title xml:lang="en">Dummy content</ns0:title>
-        <ns0:description xml:lang="en">
-        Dummy content
-      </ns0:description>
-        <ns0:fixtext xml:lang="en">str1<br />str2</ns0:fixtext>
+        <ns0:fixtext xml:lang="en">HTML<br />solution</ns0:fixtext>
         <ns0:check system="http://open-scap.org/page/SCE">
           <ns0:check-import import-name="stdout">
           </ns0:check-import>
@@ -144,19 +116,19 @@
     <ns0:set-value idref="xccdf_preupg_value_migrate">1</ns0:set-value>
     <ns0:set-value idref="xccdf_preupg_value_upgrade">1</ns0:set-value>
     <ns0:set-value idref="xccdf_preupg_value_report_dir">/root/preupgrade/FOOBAR6_7</ns0:set-value>
-    <ns0:set-value idref="xccdf_preupg_value_dummy_preupg_dummy_state_module_name">dummy_preupg</ns0:set-value>
-    <ns0:set-value idref="xccdf_preupg_value_dummy_preupg_dummy_state_result_part">admin</ns0:set-value>
-    <ns0:set-value idref="xccdf_preupg_value_dummy_preupg_dummy_state_current_directory">/root/preupgrade/FOOBAR6_7/dummy/preupg</ns0:set-value>
-    <ns0:set-value idref="xccdf_preupg_value_dummy_preupg_dummy_state_solution_file">solution.txt</ns0:set-value>
-    <ns0:rule-result idref="xccdf_preupg_rule_dummy_preupg_dummy" time="2016-08-24T17:39:11" weight="1.000000">
-      <ns0:result>RESULT_VALUE</ns0:result>
+    <ns0:set-value idref="xccdf_preupg_value_dummy_preupg_dummy1_state_module_name">dummy_preupg</ns0:set-value>
+    <ns0:set-value idref="xccdf_preupg_value_dummy_preupg_dummy1_state_result_part">admin</ns0:set-value>
+    <ns0:set-value idref="xccdf_preupg_value_dummy_preupg_dummy1_state_current_directory">/root/preupgrade/FOOBAR6_7/dummy/preupg</ns0:set-value>
+    <ns0:set-value idref="xccdf_preupg_value_dummy_preupg_dummy1_state_solution_file">solution.txt</ns0:set-value>
+    <ns0:rule-result idref="xccdf_preupg_rule_dummy_preupg_dummy1" time="2016-08-24T17:39:11" weight="1.000000">
+      <ns0:result>RESULT_VALUE1</ns0:result>
       <ns0:check system="http://open-scap.org/page/SCE">
-        <ns0:check-import import-name="stdout">INPLACE_TAG</ns0:check-import>
+        <ns0:check-import import-name="stdout">INPLACE_TAG1</ns0:check-import>
         <ns0:check-import import-name="stderr">          </ns0:check-import>
-        <ns0:check-export export-name="MODULE_NAME" value-id="xccdf_preupg_value_dummy_preupg_dummy_state_module_name" />
-        <ns0:check-export export-name="RESULT_PART" value-id="xccdf_preupg_value_dummy_preupg_dummy_state_result_part" />
-        <ns0:check-export export-name="CURRENT_DIRECTORY" value-id="xccdf_preupg_value_dummy_preupg_dummy_state_current_directory" />
-        <ns0:check-export export-name="SOLUTION_FILE" value-id="xccdf_preupg_value_dummy_preupg_dummy_state_solution_file" />
+        <ns0:check-export export-name="MODULE_NAME" value-id="xccdf_preupg_value_dummy_preupg_dummy1_state_module_name" />
+        <ns0:check-export export-name="RESULT_PART" value-id="xccdf_preupg_value_dummy_preupg_dummy1_state_result_part" />
+        <ns0:check-export export-name="CURRENT_DIRECTORY" value-id="xccdf_preupg_value_dummy_preupg_dummy1_state_current_directory" />
+        <ns0:check-export export-name="SOLUTION_FILE" value-id="xccdf_preupg_value_dummy_preupg_dummy1_state_solution_file" />
         <ns0:check-export export-name="REPORT_DIR" value-id="xccdf_preupg_value_report_dir" />
         <ns0:check-export export-name="UPGRADE" value-id="xccdf_preupg_value_upgrade" />
         <ns0:check-export export-name="MIGRATE" value-id="xccdf_preupg_value_migrate" />
@@ -166,23 +138,6 @@
         <ns0:check-content-ref href="dummy/preupg/dummy.sh" />
       </ns0:check>
     </ns0:rule-result>
-    <ns0:rule-result idref="xccdf_preupg_rule_dummy_preupg_diff" time="2016-02-24T10:39:11" weight="1.000000">
-      <ns0:result>dummy_result</ns0:result>
-      <ns0:check system="http://open-scap.org/page/SCE">
-        <ns0:check-import import-name="stdout">sample output</ns0:check-import>
-        <ns0:check-import import-name="stderr"></ns0:check-import>
-        <ns0:check-export export-name="MODULE_NAME" value-id="xccdf_preupg_value_dummy_preupg_dummy2_state_module_name" />
-        <ns0:check-export export-name="RESULT_PART" value-id="xccdf_preupg_value_dummy_preupg_dummy2_state_result_part" />
-        <ns0:check-export export-name="CURRENT_DIRECTORY" value-id="xccdf_preupg_value_dummy_preupg_dummy2_state_current_directory" />
-        <ns0:check-export export-name="SOLUTION_FILE" value-id="xccdf_preupg_value_dummy_preupg_dummy2_state_solution_file" />
-        <ns0:check-export export-name="REPORT_DIR" value-id="xccdf_preupg_value_report_dir" />
-        <ns0:check-export export-name="UPGRADE" value-id="xccdf_preupg_value_upgrade" />
-        <ns0:check-export export-name="MIGRATE" value-id="xccdf_preupg_value_migrate" />
-        <ns0:check-export export-name="DIST_NATIVE" value-id="xccdf_preupg_value_dist_native" />
-        <ns0:check-export export-name="DEVEL_MODE" value-id="xccdf_preupg_value_devel_mode" />
-        <ns0:check-export export-name="TMP_PREUPGRADE" value-id="xccdf_preupg_value_tmp_preupgrade" />
-      </ns0:check>
-    </ns0:rule-result>
     <ns0:score maximum="100.000000" system="urn:xccdf:scoring:default">49.081196</ns0:score>
     <ns0:score maximum="70.000000" system="urn:xccdf:scoring:flat">40.000000</ns0:score>
   </ns0:TestResult>