From: Xing Yang <xing.yang@emc.com>
Date: Fri, 7 Mar 2014 18:43:22 +0000 (-0500)
Subject: EMC SMI-S delete snapshot unit test takes too long
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=8ed3a0aab4cc7db527a3ab0940e8cb353eb33348;p=openstack-build%2Fcinder-build.git

EMC SMI-S delete snapshot unit test takes too long

EMC SMI-S unit test for deleting snapshot takes too long.
This patch sets Timout to 0 in cinder_emc_config.xml
so that it will return immediately.  Without this fix,
it will wait for 10 seconds by default.

Change-Id: I223f6741a2ce393e555467350201a695ae210152
Closes-Bug: #1289653
---

diff --git a/cinder/tests/test_emc_smis.py b/cinder/tests/test_emc_smis.py
index 7e5a7ccc2..aa4372b6d 100644
--- a/cinder/tests/test_emc_smis.py
+++ b/cinder/tests/test_emc_smis.py
@@ -947,6 +947,11 @@ class EMCSMISISCSIDriverTestCase(test.TestCase):
         emc.appendChild(ecompassword)
         ecompassword.appendChild(ecompasswordtext)
 
+        timeout = doc.createElement("Timeout")
+        timeouttext = doc.createTextNode("0")
+        emc.appendChild(timeout)
+        timeout.appendChild(timeouttext)
+
         self.config_file_path = self.tempdir + '/' + self.data.config_file_name
         f = open(self.config_file_path, 'w')
         doc.writexml(f)
@@ -1149,6 +1154,11 @@ class EMCSMISFCDriverTestCase(test.TestCase):
         emc.appendChild(ecompassword)
         ecompassword.appendChild(ecompasswordtext)
 
+        timeout = doc.createElement("Timeout")
+        timeouttext = doc.createTextNode("0")
+        emc.appendChild(timeout)
+        timeout.appendChild(timeouttext)
+
         self.config_file_path = self.tempdir + '/' + self.data.config_file_name
         f = open(self.config_file_path, 'w')
         doc.writexml(f)