You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by gi...@apache.org on 2014/02/14 09:57:36 UTC
git commit: updated refs/heads/marvin to f3a77c7
Updated Branches:
refs/heads/marvin f0eb184d8 -> f3a77c79e
CLOUDSTACK-5674: cls.fail does not work in setUpClass fixed it with assert.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f3a77c79
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f3a77c79
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f3a77c79
Branch: refs/heads/marvin
Commit: f3a77c79e8ce5b6c1448737520a5c3e159e5337d
Parents: f0eb184
Author: Girish Shilamkar <gi...@clogeny.com>
Authored: Fri Feb 14 14:27:13 2014 +0530
Committer: Girish Shilamkar <gi...@clogeny.com>
Committed: Fri Feb 14 14:27:13 2014 +0530
----------------------------------------------------------------------
test/integration/smoke/test_affinity_groups.py | 2 +-
test/integration/smoke/test_deploy_vm.py | 2 +-
test/integration/smoke/test_deploy_vm_with_userdata.py | 2 +-
.../smoke/test_deploy_vms_with_varied_deploymentplanners.py | 2 +-
test/integration/smoke/test_internal_lb.py | 2 +-
test/integration/smoke/test_loadbalance.py | 2 +-
test/integration/smoke/test_multipleips_per_nic.py | 2 +-
test/integration/smoke/test_network.py | 2 +-
test/integration/smoke/test_network_acl.py | 2 +-
test/integration/smoke/test_reset_vm_on_reboot.py | 2 +-
test/integration/smoke/test_scale_vm.py | 2 +-
test/integration/smoke/test_service_offerings.py | 2 +-
test/integration/smoke/test_snapshots.py | 2 +-
test/integration/smoke/test_templates.py | 4 ++--
test/integration/smoke/test_vm_life_cycle.py | 4 ++--
test/integration/smoke/test_vm_snapshots.py | 2 +-
test/integration/smoke/test_volumes.py | 4 ++--
test/integration/smoke/test_vpc_vpn.py | 4 ++--
18 files changed, 22 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f3a77c79/test/integration/smoke/test_affinity_groups.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_affinity_groups.py b/test/integration/smoke/test_affinity_groups.py
index dab60b1..75d9c48 100644
--- a/test/integration/smoke/test_affinity_groups.py
+++ b/test/integration/smoke/test_affinity_groups.py
@@ -47,7 +47,7 @@ class TestDeployVmWithAffinityGroup(cloudstackTestCase):
)
if cls.template == FAILED:
- cls.fail("get_template() failed to return template with description %s" % cls.services["ostype"])
+ assert False, "get_template() failed to return template with description %s" % cls.services["ostype"]
cls.services["virtual_machine"]["zoneid"] = cls.zone.id
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f3a77c79/test/integration/smoke/test_deploy_vm.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_deploy_vm.py b/test/integration/smoke/test_deploy_vm.py
index 9f40f78..7b0647b 100644
--- a/test/integration/smoke/test_deploy_vm.py
+++ b/test/integration/smoke/test_deploy_vm.py
@@ -49,7 +49,7 @@ class TestDeployVM(cloudstackTestCase):
self.template = get_template(self.apiclient, self.zone.id, self.testdata["ostype"])
if self.template == FAILED:
- self.fail("get_template() failed to return template with description %s" % self.testdata["ostype"])
+ self.fail("get_template() failed to return template with description %s" % self.testdata["ostype"]
#create a user account
self.account = Account.create(
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f3a77c79/test/integration/smoke/test_deploy_vm_with_userdata.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_deploy_vm_with_userdata.py b/test/integration/smoke/test_deploy_vm_with_userdata.py
index eb03194..bcef01a 100644
--- a/test/integration/smoke/test_deploy_vm_with_userdata.py
+++ b/test/integration/smoke/test_deploy_vm_with_userdata.py
@@ -53,7 +53,7 @@ class TestDeployVmWithUserData(cloudstackTestCase):
)
if cls.template == FAILED:
- cls.fail("get_template() failed to return template with description %s" % cls.services["ostype"])
+ assert False, "get_template() failed to return template with description %s" % cls.services["ostype"]
cls.debug("Successfully created account: %s, id: \
%s" % (cls.account.name,\
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f3a77c79/test/integration/smoke/test_deploy_vms_with_varied_deploymentplanners.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_deploy_vms_with_varied_deploymentplanners.py b/test/integration/smoke/test_deploy_vms_with_varied_deploymentplanners.py
index c0c77e7..afc9802 100644
--- a/test/integration/smoke/test_deploy_vms_with_varied_deploymentplanners.py
+++ b/test/integration/smoke/test_deploy_vms_with_varied_deploymentplanners.py
@@ -42,7 +42,7 @@ class TestDeployVmWithVariedPlanners(cloudstackTestCase):
)
if cls.template == FAILED:
- cls.fail("get_template() failed to return template with description %s" % cls.services["ostype"])
+ assert false, "get_template() failed to return template with description %s" % cls.services["ostype"]
cls.services["virtual_machine"]["zoneid"] = cls.zone.id
cls.services["template"] = cls.template.id
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f3a77c79/test/integration/smoke/test_internal_lb.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_internal_lb.py b/test/integration/smoke/test_internal_lb.py
index 8a64b4d..b25c404 100644
--- a/test/integration/smoke/test_internal_lb.py
+++ b/test/integration/smoke/test_internal_lb.py
@@ -48,7 +48,7 @@ class TestInternalLb(cloudstackTestCase):
)
if cls.template == FAILED:
- cls.fail("get_template() failed to return template with description %s" % cls.services["ostype"])
+ assert False, "get_template() failed to return template with description %s" % cls.services["ostype"]
cls.debug("Successfully created account: %s, id: \
%s" % (cls.account.name,\
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f3a77c79/test/integration/smoke/test_loadbalance.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_loadbalance.py b/test/integration/smoke/test_loadbalance.py
index 28a14e4..37a11f6 100644
--- a/test/integration/smoke/test_loadbalance.py
+++ b/test/integration/smoke/test_loadbalance.py
@@ -45,7 +45,7 @@ class TestLoadBalance(cloudstackTestCase):
cls.services["ostype"]
)
if cls.template == FAILED:
- cls.fail("get_template() failed to return template with description %s" % cls.services["ostype"])
+ assert False, "get_template() failed to return template with description %s" % cls.services["ostype"]
cls.services["server"]["zoneid"] = cls.zone.id
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f3a77c79/test/integration/smoke/test_multipleips_per_nic.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_multipleips_per_nic.py b/test/integration/smoke/test_multipleips_per_nic.py
index 9c7f2f7..4d0fbf4 100644
--- a/test/integration/smoke/test_multipleips_per_nic.py
+++ b/test/integration/smoke/test_multipleips_per_nic.py
@@ -53,7 +53,7 @@ class TestDeployVM(cloudstackTestCase):
self.template = get_template(self.apiclient, self.zone.id, self.testdata["ostype"])
if self.template == FAILED:
- self.fail("get_template() failed to return template with description %s" % self.testdata["ostype"])
+ assert False, "get_template() failed to return template with description %s" % self.testdata["ostype"]
#create a user account
self.account = Account.create(
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f3a77c79/test/integration/smoke/test_network.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_network.py b/test/integration/smoke/test_network.py
index 258d254..1e9ff80 100644
--- a/test/integration/smoke/test_network.py
+++ b/test/integration/smoke/test_network.py
@@ -240,7 +240,7 @@ class TestPortForwarding(cloudstackTestCase):
cls.services["ostype"]
)
if template == FAILED:
- cls.fail("get_template() failed to return template with description %s" % cls.services["ostype"])
+ assert False, "get_template() failed to return template with description %s" % cls.services["ostype"]
#Create an account, network, VM and IP addresses
cls.account = Account.create(
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f3a77c79/test/integration/smoke/test_network_acl.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_network_acl.py b/test/integration/smoke/test_network_acl.py
index 1133bee..f42ef46 100644
--- a/test/integration/smoke/test_network_acl.py
+++ b/test/integration/smoke/test_network_acl.py
@@ -46,7 +46,7 @@ class TestNetworkACL(cloudstackTestCase):
)
if cls.template == FAILED:
- cls.fail("get_template() failed to return template with description %s" % cls.services["ostype"])
+ assert False, "get_template() failed to return template with description %s" % cls.services["ostype"]
cls.debug("Successfully created account: %s, id: \
%s" % (cls.account.name,\
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f3a77c79/test/integration/smoke/test_reset_vm_on_reboot.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_reset_vm_on_reboot.py b/test/integration/smoke/test_reset_vm_on_reboot.py
index 253f0f4..284df0c 100644
--- a/test/integration/smoke/test_reset_vm_on_reboot.py
+++ b/test/integration/smoke/test_reset_vm_on_reboot.py
@@ -45,7 +45,7 @@ class TestResetVmOnReboot(cloudstackTestCase):
cls.services["ostype"]
)
if template == FAILED:
- cls.fail("get_template() failed to return template with description %s" % cls.services["ostype"])
+ assert False, "get_template() failed to return template with description %s" % cls.services["ostype"])
# Set Zones and disk offerings ??
cls.services["small"]["zoneid"] = zone.id
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f3a77c79/test/integration/smoke/test_scale_vm.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_scale_vm.py b/test/integration/smoke/test_scale_vm.py
index 5ab4463..2e038ec 100644
--- a/test/integration/smoke/test_scale_vm.py
+++ b/test/integration/smoke/test_scale_vm.py
@@ -45,7 +45,7 @@ class TestScaleVm(cloudstackTestCase):
cls.services["ostype"]
)
if template == FAILED:
- cls.fail("get_template() failed to return template with description %s" % cls.services["ostype"])
+ assert False, "get_template() failed to return template with description %s" % cls.services["ostype"]
# Set Zones and disk offerings ??
cls.services["small"]["zoneid"] = zone.id
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f3a77c79/test/integration/smoke/test_service_offerings.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_service_offerings.py b/test/integration/smoke/test_service_offerings.py
index 0c7752d..809188c 100644
--- a/test/integration/smoke/test_service_offerings.py
+++ b/test/integration/smoke/test_service_offerings.py
@@ -154,7 +154,7 @@ class TestServiceOfferings(cloudstackTestCase):
cls.services["ostype"]
)
if template == FAILED:
- cls.fail("get_template() failed to return template with description %s" % cls.services["ostype"])
+ assert False, "get_template() failed to return template with description %s" % cls.services["ostype"]
# Set Zones and disk offerings
cls.services["small"]["zoneid"] = cls.zone.id
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f3a77c79/test/integration/smoke/test_snapshots.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_snapshots.py b/test/integration/smoke/test_snapshots.py
index d475d87..5006501 100644
--- a/test/integration/smoke/test_snapshots.py
+++ b/test/integration/smoke/test_snapshots.py
@@ -41,7 +41,7 @@ class TestSnapshotRootDisk(cloudstackTestCase):
cls.services["ostype"]
)
if template == FAILED:
- cls.fail("get_template() failed to return template with description %s" % cls.services["ostype"])
+ self.assert "get_template() failed to return template with description %s" % cls.services["ostype"]
cls.services["domainid"] = cls.domain.id
cls.services["server_without_disk"]["zoneid"] = cls.zone.id
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f3a77c79/test/integration/smoke/test_templates.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_templates.py b/test/integration/smoke/test_templates.py
index 26bbb55..a2ac662 100644
--- a/test/integration/smoke/test_templates.py
+++ b/test/integration/smoke/test_templates.py
@@ -71,7 +71,7 @@ class TestCreateTemplate(cloudstackTestCase):
cls.services["ostype"]
)
if template == FAILED:
- cls.fail("get_template() failed to return template with description %s" % cls.services["ostype"])
+ assert False, "get_template() failed to return template with description %s" % cls.services["ostype"]
cls.services["template"]["ostypeid"] = template.ostypeid
cls.services["template_2"]["ostypeid"] = template.ostypeid
@@ -249,7 +249,7 @@ class TestTemplates(cloudstackTestCase):
cls.services["ostype"]
)
if template == FAILED:
- cls.fail("get_template() failed to return template with description %s" % cls.services["ostype"])
+ assert False, "get_template() failed to return template with description %s" % cls.services["ostype"]
cls.services["virtual_machine"]["zoneid"] = cls.zone.id
cls.services["volume"]["diskoffering"] = cls.disk_offering.id
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f3a77c79/test/integration/smoke/test_vm_life_cycle.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_vm_life_cycle.py b/test/integration/smoke/test_vm_life_cycle.py
index 05ecba5..db144b6 100644
--- a/test/integration/smoke/test_vm_life_cycle.py
+++ b/test/integration/smoke/test_vm_life_cycle.py
@@ -55,7 +55,7 @@ class TestDeployVM(cloudstackTestCase):
cls.services["ostype"]
)
if template == FAILED:
- cls.fail("get_template() failed to return template with description %s" % cls.services["ostype"])
+ assert False, "get_template() failed to return template with description %s" % cls.services["ostype"]
# Set Zones and disk offerings
cls.services["small"]["zoneid"] = cls.zone.id
@@ -216,7 +216,7 @@ class TestVMLifeCycle(cloudstackTestCase):
cls.services["ostype"]
)
if template == FAILED:
- cls.fail("get_template() failed to return template with description %s" % cls.services["ostype"])
+ assert False, "get_template() failed to return template with description %s" % cls.services["ostype"]
# Set Zones and disk offerings
cls.services["small"]["zoneid"] = cls.zone.id
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f3a77c79/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 6f64802..f3625ee 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.services["ostype"]
)
if cls.template == FAILED:
- cls.fail("get_template() failed to return template with description %s" % cls.services["ostype"])
+ assert False, "get_template() failed to return template with description %s" % cls.services["ostype"]
cls.services["domainid"] = cls.domain.id
cls.services["server"]["zoneid"] = cls.zone.id
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f3a77c79/test/integration/smoke/test_volumes.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_volumes.py b/test/integration/smoke/test_volumes.py
index 70172ca..6610b79 100644
--- a/test/integration/smoke/test_volumes.py
+++ b/test/integration/smoke/test_volumes.py
@@ -61,7 +61,7 @@ class TestCreateVolume(cloudstackTestCase):
cls.services["ostype"]
)
if template == FAILED:
- cls.fail("get_template() failed to return template with description %s" % cls.services["ostype"])
+ assert False, "get_template() failed to return template with description %s" % cls.services["ostype"]
cls.services["domainid"] = cls.domain.id
cls.services["zoneid"] = cls.zone.id
@@ -244,7 +244,7 @@ class TestVolumes(cloudstackTestCase):
cls.services["ostype"]
)
if template == FAILED:
- cls.fail("get_template() failed to return template with description %s" % cls.services["ostype"])
+ assert False, "get_template() failed to return template with description %s" % cls.services["ostype"]
cls.services["domainid"] = cls.domain.id
cls.services["zoneid"] = cls.zone.id
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f3a77c79/test/integration/smoke/test_vpc_vpn.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_vpc_vpn.py b/test/integration/smoke/test_vpc_vpn.py
index 4ec2da1..11531d1 100644
--- a/test/integration/smoke/test_vpc_vpn.py
+++ b/test/integration/smoke/test_vpc_vpn.py
@@ -47,7 +47,7 @@ class TestVpcRemoteAccessVpn(cloudstackTestCase):
cls.services["ostype"]
)
if cls.template == FAILED:
- cls.fail("get_template() failed to return template with description %s" % cls.services["ostype"])
+ assert False, "get_template() failed to return template with description %s" % cls.services["ostype"]
cls.cleanup = [cls.account]
@@ -154,7 +154,7 @@ class TestVpcSite2SiteVpn(cloudstackTestCase):
cls.services["ostype"]
)
if cls.template == FAILED:
- cls.fail("get_template() failed to return template with description %s" % cls.services["ostype"])
+ assert False, "get_template() failed to return template with description %s" % cls.services["ostype"]
cls.cleanup = [cls.account]