You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ja...@apache.org on 2015/06/29 09:00:41 UTC
[20/50] [abbrv] git commit: updated refs/heads/dhcpoffload to 45721ae
CLOUDSTACK-8577: fixing script testpath_disable_enable_zone
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/77508c9d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/77508c9d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/77508c9d
Branch: refs/heads/dhcpoffload
Commit: 77508c9d9a2f1679ecb157bc975990ccaf9f8783
Parents: 4945175
Author: nitt10prashant <ni...@gmail.com>
Authored: Mon Jun 22 18:35:40 2015 +0530
Committer: sanjeev <sa...@apache.org>
Committed: Wed Jun 24 10:50:20 2015 +0530
----------------------------------------------------------------------
test/integration/component/maint/testpath_disable_enable_zone.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/77508c9d/test/integration/component/maint/testpath_disable_enable_zone.py
----------------------------------------------------------------------
diff --git a/test/integration/component/maint/testpath_disable_enable_zone.py b/test/integration/component/maint/testpath_disable_enable_zone.py
index 3cbd3d5..a15173e 100644
--- a/test/integration/component/maint/testpath_disable_enable_zone.py
+++ b/test/integration/component/maint/testpath_disable_enable_zone.py
@@ -185,7 +185,7 @@ class TestDisableEnableZone(cloudstackTestCase):
self.testdata["small"],
templateid=self.template.id,
accountid=self.admin_account.name,
- domainid=self.account.domainid,
+ domainid=self.admin_account.domainid,
serviceofferingid=self.service_offering.id,
zoneid=self.zone.id
)
@@ -280,6 +280,7 @@ class TestDisableEnableZone(cloudstackTestCase):
self.testdata["privatetemplate"]["hypervisor"] = builtin_info[1]
self.testdata["privatetemplate"]["format"] = builtin_info[2]
"""
+ //commenting it for now will uncomment once expected behaviour is known
Template.register(
self.apiclient,
self.testdata["privatetemplate"],
@@ -294,6 +295,7 @@ class TestDisableEnableZone(cloudstackTestCase):
diskofferingid=self.disk_offering.id
)
"""
+ //commenting it for now will uncomment once expected behaviour is known
Iso.create(
self.apiclient,
self.testdata["iso2"],