cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t..@apache.org
Subject git commit: updated refs/heads/master to 2c84866
Date Wed, 05 Jun 2013 13:02:43 GMT
Updated Branches:
  refs/heads/master 1696e8cb1 -> 2c84866e0


CLOUDSTACK-2858: Fix copy tempate/iso tests

Signed-off-by: Prasanna Santhanam <tsp@apache.org>


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

Branch: refs/heads/master
Commit: 2c84866e020d6d89ea081e76d3c2cb54bf1d7703
Parents: 1696e8c
Author: SrikanteswaraRao Talluri <srikanteswararao.talluri@citrix.com>
Authored: Wed Jun 5 18:06:14 2013 +0530
Committer: Prasanna Santhanam <tsp@apache.org>
Committed: Wed Jun 5 18:32:27 2013 +0530

----------------------------------------------------------------------
 test/integration/smoke/test_iso.py       |    2 +-
 test/integration/smoke/test_templates.py |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2c84866e/test/integration/smoke/test_iso.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_iso.py b/test/integration/smoke/test_iso.py
index c645d3b..75289b8 100644
--- a/test/integration/smoke/test_iso.py
+++ b/test/integration/smoke/test_iso.py
@@ -485,7 +485,7 @@ class TestISO(cloudstackTestCase):
         if len(self.zones) <= 1:
             self.skipTest("Not enough zones available to perform copy template")
 
-        self.services["destzoneid"] = filter(lambda z: z.id != self.zone.id, self.zones)[0]
+        self.services["destzoneid"] = filter(lambda z: z.id != self.zone.id, self.zones)[0].id
 
         self.debug("Copy ISO from %s to %s" % (
                                                self.zone.id,

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2c84866e/test/integration/smoke/test_templates.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_templates.py b/test/integration/smoke/test_templates.py
index 8b83f5e..9478440 100644
--- a/test/integration/smoke/test_templates.py
+++ b/test/integration/smoke/test_templates.py
@@ -665,7 +665,7 @@ class TestTemplates(cloudstackTestCase):
         if len(self.zones) <= 1:
             self.skipTest("Not enough zones available to perform copy template")
 
-        self.services["destzoneid"] = filter(lambda z: z.id != self.services["sourcezoneid"],
self.zones)[0]
+        self.services["destzoneid"] = filter(lambda z: z.id != self.services["sourcezoneid"],
self.zones)[0].id
 
         self.debug("Copy template from Zone: %s to %s" % (
                                             self.services["sourcezoneid"],


Mime
View raw message