cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From santhosheduku...@apache.org
Subject git commit: updated refs/heads/master to 5f816e3
Date Thu, 07 Aug 2014 08:32:59 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 1e3a68979 -> 5f816e3e3


CLOUDSTACK-7271: Accept any hypervisor in error message

Signed-off-by: Santhosh Edukulla <santhosh.edukulla@gmail.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5f816e3e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5f816e3e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5f816e3e

Branch: refs/heads/master
Commit: 5f816e3e3fcee259fbdd2153d72625254126ba25
Parents: 1e3a689
Author: John Dilley <john.dilley@citrix.com>
Authored: Wed Aug 6 14:55:30 2014 +0000
Committer: Santhosh Edukulla <santhosh.edukulla@gmail.com>
Committed: Thu Aug 7 14:02:38 2014 +0530

----------------------------------------------------------------------
 test/integration/smoke/test_deploy_vm_root_resize.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5f816e3e/test/integration/smoke/test_deploy_vm_root_resize.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_deploy_vm_root_resize.py b/test/integration/smoke/test_deploy_vm_root_resize.py
index 029e7db..9a09e46 100644
--- a/test/integration/smoke/test_deploy_vm_root_resize.py
+++ b/test/integration/smoke/test_deploy_vm_root_resize.py
@@ -35,6 +35,8 @@ from marvin.codes import FAILED
 
 from nose.plugins.attrib import attr
 
+import re
+
 class TestData(object):
     """Test data object that is required to create resources
     """
@@ -195,7 +197,7 @@ class TestDeployVM(cloudstackTestCase):
                     rootdisksize=newrootsize
                 )
             except Exception as ex:
-                if "Hypervisor XenServer does not support rootdisksize override" in str(ex):
+                if re.search("Hypervisor \S+ does not support rootdisksize override", str(ex)):
                     success = True
                 else:
                     self.debug("virtual machine create did not fail appropriately. Error
was actually : " + str(ex));


Mime
View raw message