You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by sa...@apache.org on 2015/09/02 08:17:55 UTC
git commit: updated refs/heads/master to 2eb8360
Repository: cloudstack
Updated Branches:
refs/heads/master 4f9aaf32f -> 2eb83604a
CLOUDSTACK-8755: xs-tools.iso missing from ISOs in CCP GUI
This closes #727
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2eb83604
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2eb83604
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2eb83604
Branch: refs/heads/master
Commit: 2eb83604a24c9815bce7570236d38a82068d1ddd
Parents: 4f9aaf3
Author: shweta agarwal <sh...@citrix.com>
Authored: Fri Aug 21 17:33:23 2015 +0530
Committer: sanjeev <sa...@apache.org>
Committed: Wed Sep 2 11:46:28 2015 +0530
----------------------------------------------------------------------
test/integration/smoke/test_iso.py | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2eb83604/test/integration/smoke/test_iso.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_iso.py b/test/integration/smoke/test_iso.py
index 830f52a..9bad575 100755
--- a/test/integration/smoke/test_iso.py
+++ b/test/integration/smoke/test_iso.py
@@ -19,13 +19,14 @@
# Import Local Modules
from marvin.cloudstackTestCase import cloudstackTestCase, unittest
from marvin.cloudstackAPI import listZones, updateIso, extractIso, updateIsoPermissions, copyIso, deleteIso
-from marvin.lib.utils import cleanup_resources, random_gen, get_hypervisor_type
+from marvin.lib.utils import cleanup_resources, random_gen, get_hypervisor_type,validateList
from marvin.lib.base import Account, Iso
from marvin.lib.common import (get_domain,
get_zone,
list_isos,
list_os_types)
from nose.plugins.attrib import attr
+from marvin.codes import PASS
import urllib
# Import System modules
import time
@@ -253,13 +254,15 @@ class TestISO(cloudstackTestCase):
list_default_iso_response = list_isos(
self.apiclient,
name=isoname,
+ account="system",
isready="true"
)
- self.assertEqual(
- list_default_iso_response,
- None,
- "Check if ISO exists in ListIsos"
- )
+ status = validateList(list_default_iso_response)
+ self.assertEquals(
+ PASS,
+ status[0],
+ "Check if ISO exists in ListIsos")
+
@attr(
tags=[
@@ -600,6 +603,6 @@ class TestISO(cloudstackTestCase):
# list ISO should list default ISOS (VM and xen tools)
# ListIsos to list default ISOS (VM and xen tools)
- self.get_iso_details("xs-tools.iso")
self.get_iso_details("vmware-tools.iso")
+ self.get_iso_details("xs-tools.iso")
return