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/marvin to bacfd10
Date Fri, 04 Apr 2014 16:06:33 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/marvin 0d5ec6337 -> bacfd109e


CLOUDSTACK-6316: Fixed bvt failures because of test data and wrong references
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/bacfd109
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/bacfd109
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/bacfd109

Branch: refs/heads/marvin
Commit: bacfd109e2201d9b4e8f38df1605da2d0e21a1c4
Parents: 0d5ec63
Author: SrikanteswaraRao Talluri <talluri@apache.org>
Authored: Fri Apr 4 21:35:30 2014 +0530
Committer: SrikanteswaraRao Talluri <talluri@apache.org>
Committed: Fri Apr 4 21:35:30 2014 +0530

----------------------------------------------------------------------
 test/integration/smoke/test_nic.py             | 2 +-
 test/integration/smoke/test_public_ip_range.py | 4 +++-
 test/integration/smoke/test_volumes.py         | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bacfd109/test/integration/smoke/test_nic.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_nic.py b/test/integration/smoke/test_nic.py
index de027ee..f812c3e 100644
--- a/test/integration/smoke/test_nic.py
+++ b/test/integration/smoke/test_nic.py
@@ -69,7 +69,7 @@ class TestNic(cloudstackTestCase):
             self.services["small"]["zoneid"] = zone.id
             self.services["small"]["template"] = template.id
 
-            self.services["iso_1"]["zoneid"] = zone.id
+            self.services["iso1"]["zoneid"] = zone.id
             self.services["network"]["zoneid"] = zone.id
 
             # Create Account, VMs, NAT Rules etc

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bacfd109/test/integration/smoke/test_public_ip_range.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_public_ip_range.py b/test/integration/smoke/test_public_ip_range.py
index 0be7a19..bedf94d 100644
--- a/test/integration/smoke/test_public_ip_range.py
+++ b/test/integration/smoke/test_public_ip_range.py
@@ -36,7 +36,9 @@ class TestDedicatePublicIPRange(cloudstackTestCase):
         # Get Zone, Domain
         cls.domain = get_domain(cls.apiclient)
         cls.zone = get_zone(cls.apiclient, cls.testClient.getZoneForTests())
-
+        cls.services["zoneid"] = cls.zone.id
+        pod = get_pod(cls.apiclient, cls.zone.id)
+        cls.services["podid"] = pod.id
         # Create Account
         cls.account = Account.create(
                             cls.apiclient,

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bacfd109/test/integration/smoke/test_volumes.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_volumes.py b/test/integration/smoke/test_volumes.py
index 6610b79..c0362d1 100644
--- a/test/integration/smoke/test_volumes.py
+++ b/test/integration/smoke/test_volumes.py
@@ -67,7 +67,7 @@ class TestCreateVolume(cloudstackTestCase):
         cls.services["zoneid"] = cls.zone.id
         cls.services["template"] = template.id
         cls.services["customdiskofferingid"] = cls.custom_disk_offering.id
-
+        cls.services["diskname"] = cls.services["volume"]["diskname"]
         # Create VMs, NAT Rules etc
         cls.account = Account.create(
                             cls.apiclient,


Mime
View raw message