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 2013/11/08 13:35:21 UTC
git commit: updated refs/heads/master to 011b87e
Updated Branches:
refs/heads/master d05891afa -> 011b87ead
fixed indentaion problem in utils.py :359
Conflicts:
tools/marvin/marvin/integration/lib/utils.py
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/011b87ea
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/011b87ea
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/011b87ea
Branch: refs/heads/master
Commit: 011b87eadcf3dd9694080a23ebe1eebd65676e79
Parents: d05891a
Author: SrikanteswaraRao Talluri <ta...@apache.org>
Authored: Fri Nov 8 18:00:55 2013 +0530
Committer: SrikanteswaraRao Talluri <ta...@apache.org>
Committed: Fri Nov 8 18:05:05 2013 +0530
----------------------------------------------------------------------
tools/marvin/marvin/integration/lib/utils.py | 31 +++++++++++------------
1 file changed, 15 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/011b87ea/tools/marvin/marvin/integration/lib/utils.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/utils.py b/tools/marvin/marvin/integration/lib/utils.py
index a106fc0..df3ca8a 100644
--- a/tools/marvin/marvin/integration/lib/utils.py
+++ b/tools/marvin/marvin/integration/lib/utils.py
@@ -329,11 +329,10 @@ def is_snapshot_on_nfs(apiclient, dbconn, config, zoneid, snapshotid):
(config.mgtSvr[0].mgtSvrIp, e))
return 'snapshot exists' in result
-
def validateList(inp):
- '''
- @name: validateList
- @Description: 1. A utility function to validate
+ """
+ @name: validateList
+ @Description: 1. A utility function to validate
whether the input passed is a list
2. The list is empty or not
3. If it is list and not empty, return PASS and first element
@@ -350,18 +349,18 @@ def validateList(inp):
default to None.
INVALID_INPUT
EMPTY_LIST
- '''
- ret = [FAIL, None, None]
- if inp is None:
- ret[2] = INVALID_INPUT
- return ret
- if not isinstance(inp, list):
- ret[2] = INVALID_INPUT
- return ret
- if len(inp) == 0:
- ret[2] = EMPTY_LIST
- return ret
- return [PASS, inp[0], None]
+ """
+ ret = [FAIL, None, None]
+ if inp is None:
+ ret[2] = INVALID_INPUT
+ return ret
+ if not isinstance(inp, list):
+ ret[2] = INVALID_INPUT
+ return ret
+ if len(inp) == 0:
+ ret[2] = EMPTY_LIST
+ return ret
+ return [PASS, inp[0], None]
def verifyElementInList(inp, toverify, responsevar=None, pos=0):
'''