Merge pull request #1 from ggbecker/pr-5295

Add return statement after final scan on libvirt-based.
ComplianceAsCode · Mar 17, 2020 · 5f51ce8 · 5f51ce8
2 parents 30593cb + fd6f604
commit 5f51ce8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/tests/ssg_test_suite/oscap.py b/tests/ssg_test_suite/oscap.py
@@ -424,7 +424,7 @@ def final(self):
             logging.info("Rebooting domain '{0}' before final scan."
                          .format(self.environment.domain_name))
             self.environment.reboot()
-        GenericRunner.final(self)
+        return GenericRunner.final(self)
 
     def make_oscap_call(self):
         self.prepare_online_scanning_arguments()

diff --git a/tests/ssg_test_suite/profile.py b/tests/ssg_test_suite/profile.py
@@ -29,8 +29,11 @@ def _run_test(self, profile, test_data):
             self.test_env, profile, self.datastream, self.benchmark_id)
 
         for stage in ("initial", "remediation", "final"):
-            logging.info("Evaluation of profile {0} ({1} stage).".format(profile, stage))
             result = runner.run_stage(stage)
+            if result:
+                logging.info("Evaluation of the profile has passed: {0} ({1} stage).".format(profile, stage))
+            else:
+                logging.error("Evaluation of the profile has failed: {0} ({1} stage).".format(profile, stage))
 
 
 def perform_profile_check(options):