1 files changed, 44 insertions, 31 deletions

diff --git a/TestUnits/cli/volume/top/testunit.py b/TestUnits/cli/volume/top/testunit.py
index f0f6b5d..6edf3b4 100644
--- a/TestUnits/cli/volume/top/testunit.py
+++ b/TestUnits/cli/volume/top/testunit.py
@@ -17,40 +17,42 @@ def initialize():
     """
     """
     logger = GlobalObj.getLoggerObj()
-    return_status = 1
     testenv_file = GlobalObj.testenv_file
     testenv_abspath =  os.path.join(dir_path, testenv_file)
 
     if not (os.path.isfile(testenv_abspath)):
         logger.error("%s not found in %s" % (testenv_file, dir_path))
-        
-    if parser.parse_testenv_configfile(testenv_abspath):
+
+    return_status = parser.parse_testenv_configfile(testenv_abspath)
+    if return_status is not 0:
         return return_status
-    if managerutils.ssh_connect_allhosts():
+
+    return_status = managerutils.ssh_connect_allhosts()
+    if return_status is not 0:
         return return_status
-    
+
     return 0
 
 def setup():
     """
     """
-    return_status = 1
-    if atfutils.set_active_volume("volume1"):
+    return_status = atfutils.set_active_volume("volume1")
+    if return_status is not 0:
         return return_status
+
     return 0
 
 def execute():
     """
     """
     logger = GlobalObj.getLoggerObj()
-    return_status = 1
     testcaseslist_file = GlobalObj.testcaseslist_file
     testcaseslist_abspath = os.path.join(dir_path, testcaseslist_file)
-    
+
     if not (os.path.isfile(testcaseslist_abspath)):
         logger.error("%s not found in %s" % (testcaseslist_file, dir_path))
-        return return_status
-    
+        return 1
+
     else:
         testcaseslist = []
         testcaseslist = parser.parse_testcaseslist_file(testcaseslist_abspath)
@@ -62,27 +64,32 @@ def execute():
             passedtestcases = 0
             failedtestcases = 0
             selectedtestcases = len(testcaseslist)
-            
+
             logger.info("Starting TestUnit: '%s' test execution" % dir_path)
-            testcases.reset_testenv()
-            testcases.setup_testenv()
+
+            return_status = testcases.reset_testenv()
+            if return_status is not 0:
+                return return_status
+
+            return_status = testcases.setup_testenv()
+            if return_status is not 0:
+                return return_status
+
             for testcase in testcaseslist:
                 function_obj = getattr(testcases, testcase)
                 if function_obj:
-                    logger.debug("Starting Test: ' %s '" % testcase)
+                    logger.info("Starting Test: %s" % testcase)
                     return_status = function_obj()
-                    if return_status:
-                        logger.debug("TestCase '%s' Failed" % testcase)
-                        failedtestcases +=1
+                    if return_status is not 0:
+                        logger.info("TestCase %s Failed" % testcase)
+                        failedtestcases += 1
                     else:
-                        logger.debug("TestCase '%s' Passed" % testcase)
-                        passedtestcases +=1
-                    logger.debug("Ending Test: '%s'" % testcase)
+                        logger.info("TestCase %s Passed" % testcase)
+                        passedtestcases += 1
+                    logger.info("Ending Test: %s" % testcase)
                 else:
                     logger.info("TestCase %s not defined in 'testcases' module"
                                 % testcase)
-                    continue
-                    
 
             logger.info("Selected %d : Passed %d, Failed %d"
                         % (selectedtestcases,
@@ -90,25 +97,31 @@ def execute():
                            failedtestcases))
 
             logger.info("Ending TestUnit: '%s' test execution" % dir_path)
-    
+
     return 0
 
 def cleanup():
     """
     """
     pass
-    
+
 def main():
     """
     """
-    return_status = 1
-    if initialize():
+    return_status = initialize()
+    if return_status is not 0:
         return return_status
-    if setup():
+
+    return_status = setup()
+    if return_status is not 0:
         return return_status
-    if execute():
+
+    return_status = execute()
+    if return_status is not 0:
         return return_status
-    if cleanup():
+
+    return_status = cleanup()
+    if return_status is not 0:
         return return_status
-    
+
     return 0