You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2014/07/28 16:04:15 UTC
[03/50] git commit: updated refs/heads/4.4 to d5220a8
CLOUDSTACK-6782: Egress FW rules test cases - Format unicode to string before string matching
(cherry picked from commit 323de6823deda16ddafab5d79f18996c70130e2b)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ae837e34
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ae837e34
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ae837e34
Branch: refs/heads/4.4
Commit: ae837e34c6fb2029b2e3840e912330dcc3ecb4cf
Parents: c6a6b5b
Author: Gaurav Aradhye <ga...@clogeny.com>
Authored: Tue May 27 05:51:01 2014 -0700
Committer: Daan Hoogland <da...@onecht.net>
Committed: Mon Jul 28 16:02:23 2014 +0200
----------------------------------------------------------------------
test/integration/component/test_egress_fw_rules.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ae837e34/test/integration/component/test_egress_fw_rules.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_egress_fw_rules.py b/test/integration/component/test_egress_fw_rules.py
index 8da3738..6060115 100644
--- a/test/integration/component/test_egress_fw_rules.py
+++ b/test/integration/component/test_egress_fw_rules.py
@@ -274,7 +274,10 @@ class TestEgressFWRules(cloudstackTestCase):
self.debug("script: %s" % script+exec_cmd_params)
self.debug("result: %s" % result)
- str_result = str(str(result).strip())
+ if isinstance(result, list):
+ str_result = str([str(x) for x in result])
+ else:
+ str_result = str(result)
str_expected_result = str(expected_result).strip()
if str_result == str_expected_result:
exec_success = True