Merge pull request #80 from lln133208/private/yuanr/fix

Remove code which will never be used
xenserver · Jul 17, 2019 · 0820962 · 0820962
2 parents 3bcd3cb + bddff40
commit 0820962
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 3 deletions.
diff --git a/src/XenCert/StorageHandler.py b/src/XenCert/StorageHandler.py
@@ -763,7 +763,6 @@ def Destroy_VDI(self, vdi_ref):
         except Exception, e:
             XenCertPrint("Failed to Destroy VDI. Exception: %s" % str(e))
             raise Exception("Failed to Destroy VDI. Exception: %s" % str(e))
-            return False
 
     #
     #  SR related
@@ -847,7 +846,6 @@ def Destroy_SR(self, sr_ref):
         except Exception, e:
             XenCertPrint("Failed to Destroy SR. Exception: %s" % str(e))
             raise Exception("Failed to Destroy SR. Exception: %s" % str(e))
-            return False
 
     def MetaDataTests(self):
         Print("MetaDataTests not applicable to %s SR type." % self.storage_conf['storage_type'].upper())

diff --git a/src/XenCert/StorageHandlerUtil.py b/src/XenCert/StorageHandlerUtil.py
@@ -617,7 +617,6 @@ def PerformSRControlPathTests(session, sr_ref):
 	bytes = 0
 	if not util.zeroOut(devicename, 1, int(vdi_size)):	    
 	    raise Exception("   - Could not write through the allocated disk space on test disk, please check the log for the exception details.")
-	    displayOperationStatus(False)
 
 	Print("   END TIME: %s " % (time.asctime(time.localtime())))
 	displayOperationStatus(True)