cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gir...@apache.org
Subject git commit: updated refs/heads/4.4 to bf76012
Date Thu, 03 Apr 2014 10:56:53 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.4 00a4e6ada -> bf76012fb


Fix problem string comparison with unicode

Conflicts:
	test/integration/component/test_egress_fw_rules.py


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

Branch: refs/heads/4.4
Commit: bf76012fba4bac735be5007859ddbd4a91197e28
Parents: 00a4e6a
Author: Girish Shilamkar <girish@clogeny.com>
Authored: Thu Mar 27 19:00:27 2014 -0400
Committer: Girish Shilamkar <girish@clogeny.com>
Committed: Thu Apr 3 16:26:35 2014 +0530

----------------------------------------------------------------------
 test/integration/component/test_egress_fw_rules.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bf76012f/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 4f3819f..8da3738 100644
--- a/test/integration/component/test_egress_fw_rules.py
+++ b/test/integration/component/test_egress_fw_rules.py
@@ -274,17 +274,19 @@ class TestEgressFWRules(cloudstackTestCase):
             self.debug("script: %s" % script+exec_cmd_params)
             self.debug("result: %s" % result)
 
-            if str(result).strip() == expected_result:
+            str_result = str(str(result).strip())
+            str_expected_result = str(expected_result).strip()
+            if str_result == str_expected_result:
                 exec_success = True
 
             if negative_test:
                 self.assertEqual(exec_success,
                                  True,
-                                 "Script result is %s matching with %s" % (result, expected_result))
+                                 "Script result is %s matching with %s" % (str_result, str_expected_result))
             else:
                 self.assertEqual(exec_success,
                                  True,
-                                 "Script result is %s is not matching with %s" % (result,
expected_result))
+                                 "Script result is %s is not matching with %s" % (str_result,
str_expected_result))
 
         except Exception as e:
             self.debug('Error=%s' % e)


Mime
View raw message