[yum-commits] test/misc-tests.py

[zpavlas at osuosl.org]

 test/misc-tests.py |   13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

New commits:
commit 313d08008eaf1132289e4789e3cd5d8ca8669b55
Author: Zdeněk Pavlas <zpavlas at redhat.com>
Date:   Mon Nov 19 12:46:57 2012 +0100

    make tests in prev. patch more readable

diff --git a/test/misc-tests.py b/test/misc-tests.py
index 4bf0821..7d7d06f 100644
--- a/test/misc-tests.py
+++ b/test/misc-tests.py
@@ -116,7 +116,7 @@ class MiscTests(DepsolveTests):
 
     def testXML(self):
         import yum.misc
-        for i in (
+        for args in (
 
 # valid utf8 and unicode
 ('\xc4\x9b\xc5\xa1\xc4\x8d', '\xc4\x9b\xc5\xa1\xc4\x8d'),
@@ -142,10 +142,13 @@ class MiscTests(DepsolveTests):
 ('abc ', 'abc'),
 
         ):
-            i = list(i); ok = i.pop()
-            ret = yum.misc.to_xml(*i)
-            self.assertEqual(type(ret), str)
-            self.assertEqual(ret, ok)
+            # last item is the expected result
+            args, expected = args[:-1], args[-1]
+            actual = yum.misc.to_xml(*args)
+
+            # actual vs expected
+            self.assertEqual(type(actual), type(expected))
+            self.assertEqual(actual, expected)
 
 def setup_logging():
     logging.basicConfig()