cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tall...@apache.org
Subject git commit: updated refs/heads/master to ff4f31c
Date Sun, 03 May 2015 17:12:26 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master ba9c4cfa8 -> ff4f31c4e


bug-id:correcting few more errors in testpaths reviewed-by: self

Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>


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

Branch: refs/heads/master
Commit: ff4f31c4ea8ee3bd2ef579f79b4bf5409c59dbb8
Parents: ba9c4cf
Author: SrikanteswaraRao Talluri <talluri@apache.org>
Authored: Sun May 3 22:40:04 2015 +0530
Committer: SrikanteswaraRao Talluri <talluri@apache.org>
Committed: Sun May 3 22:41:55 2015 +0530

----------------------------------------------------------------------
 test/integration/testpaths/testpath_stopped_vm.py      | 5 +++++
 test/integration/testpaths/testpath_volumelifecycle.py | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ff4f31c4/test/integration/testpaths/testpath_stopped_vm.py
----------------------------------------------------------------------
diff --git a/test/integration/testpaths/testpath_stopped_vm.py b/test/integration/testpaths/testpath_stopped_vm.py
index 1260330..7d8886c 100644
--- a/test/integration/testpaths/testpath_stopped_vm.py
+++ b/test/integration/testpaths/testpath_stopped_vm.py
@@ -662,6 +662,7 @@ class TestAdvancedZoneStoppedVM(cloudstackTestCase):
         # 3.  Register an ISO and attach it to the VM
         # 4.  Verify that ISO is attached to the VM
         """
+
         if self.hypervisor.lower() in ['lxc']:
             self.skipTest(
                 "feature is not supported in %s" %
@@ -727,6 +728,10 @@ class TestAdvancedZoneStoppedVM(cloudstackTestCase):
         # 4.  Verify that ISO is attached to the VM
         """
 
+        if self.hypervisor.lower() in ['lxc']:
+            self.skipTest(
+                "feature is not supported in %s" %
+                self.hypervisor)
 
         # Create VM in account
         virtual_machine = VirtualMachine.create(

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ff4f31c4/test/integration/testpaths/testpath_volumelifecycle.py
----------------------------------------------------------------------
diff --git a/test/integration/testpaths/testpath_volumelifecycle.py b/test/integration/testpaths/testpath_volumelifecycle.py
index 6e979e7..a2e8390 100644
--- a/test/integration/testpaths/testpath_volumelifecycle.py
+++ b/test/integration/testpaths/testpath_volumelifecycle.py
@@ -230,7 +230,7 @@ class TestPathVolume(cloudstackTestCase):
     def setUp(self):
         self.apiclient = self.testClient.getApiClient()
         self.dbclient = self.testClient.getDbConnection()
-        if self.unsupportedHypervisor or self.insuffPools:
+        if self.unsupportedHypervisor or self.insuffStorage:
             self.skipTest("Skipping test because of insuff resources\
                     %s" % self.hypervisor)
 


Mime
View raw message