You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ta...@apache.org on 2014/04/23 08:17:41 UTC
[29/50] [abbrv] git commit: updated refs/heads/master to d22adf9
CLOUDSTACK-5674: Minor fixes to BVT tests
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4779e575
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4779e575
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4779e575
Branch: refs/heads/master
Commit: 4779e575bb3ff5748f70ba318d42675151c2f40b
Parents: 34409d7
Author: Sanjay Tripathi <sa...@citrix.com>
Authored: Fri Apr 4 14:30:59 2014 +0530
Committer: Girish Shilamkar <gi...@clogeny.com>
Committed: Fri Apr 4 14:30:59 2014 +0530
----------------------------------------------------------------------
test/integration/smoke/test_network.py | 3 +--
test/integration/smoke/test_public_ip_range.py | 4 ++--
test/integration/smoke/test_secondary_storage.py | 2 ++
test/integration/smoke/test_vm_snapshots.py | 4 ++--
4 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4779e575/test/integration/smoke/test_network.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_network.py b/test/integration/smoke/test_network.py
index dc2e53e..b5bdb44 100644
--- a/test/integration/smoke/test_network.py
+++ b/test/integration/smoke/test_network.py
@@ -230,10 +230,9 @@ class TestPortForwarding(cloudstackTestCase):
testClient = super(TestPortForwarding, cls).getClsTestClient()
cls.apiclient = testClient.getApiClient()
cls.services = testClient.getParsedTestDataConfig()
-
# Get Zone, Domain and templates
cls.domain = get_domain(cls.apiclient)
- cls.zone = get_zone(cls.apiclient, cls.getZoneForTests())
+ cls.zone = get_zone(cls.apiclient, testClient.getZoneForTests())
template = get_template(
cls.apiclient,
cls.zone.id,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4779e575/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 ca3c83b..0be7a19 100644
--- a/test/integration/smoke/test_public_ip_range.py
+++ b/test/integration/smoke/test_public_ip_range.py
@@ -31,11 +31,11 @@ class TestDedicatePublicIPRange(cloudstackTestCase):
@classmethod
def setUpClass(cls):
cls.testClient = super(TestDedicatePublicIPRange, cls).getClsTestClient()
- cls.apiclient = cls.testClient.getApiClient()
+ cls.apiclient = cls.testClient.getApiClient()
cls.services = cls.testClient.getParsedTestDataConfig()
# Get Zone, Domain
cls.domain = get_domain(cls.apiclient)
- cls.zone = get_zone(cls.apiclient, cls.getClsTestClient.getZoneForTests())
+ cls.zone = get_zone(cls.apiclient, cls.testClient.getZoneForTests())
# Create Account
cls.account = Account.create(
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4779e575/test/integration/smoke/test_secondary_storage.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_secondary_storage.py b/test/integration/smoke/test_secondary_storage.py
index d430beb..e7548a6 100644
--- a/test/integration/smoke/test_secondary_storage.py
+++ b/test/integration/smoke/test_secondary_storage.py
@@ -187,6 +187,8 @@ class TestSecStorageServices(cloudstackTestCase):
listall=True,
account='system'
)
+ self.assertEqual(validateList(list_template_response)[0], PASS,\
+ "templates list validation failed")
# Ensure all BUILTIN templates are downloaded
templateid = None
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4779e575/test/integration/smoke/test_vm_snapshots.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_vm_snapshots.py b/test/integration/smoke/test_vm_snapshots.py
index ca6af31..6138a99 100644
--- a/test/integration/smoke/test_vm_snapshots.py
+++ b/test/integration/smoke/test_vm_snapshots.py
@@ -40,7 +40,7 @@ class TestVmSnapshot(cloudstackTestCase):
cls.zone.id,
cls.services["ostype"]
)
- if cls.template == FAILED:
+ if template == FAILED:
assert False, "get_template() failed to return template with description %s" % cls.services["ostype"]
cls.services["domainid"] = cls.domain.id
@@ -68,7 +68,7 @@ class TestVmSnapshot(cloudstackTestCase):
accountid=cls.account.name,
domainid=cls.account.domainid,
serviceofferingid=cls.service_offering.id,
- mode=cls.services["mode"]
+ mode=cls.zone.networktype
)
cls.random_data_0 = random_gen(size=100)
cls.test_dir = "/tmp"