Mercurial > kallithea

changeset 8043:7986422cacb3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: avoid unicode u'' repr in test_diff_markup output It will go away with py3 anyway.
author Mads Kiilerich <mads@kiilerich.com>
date Thu, 26 Dec 2019 11:29:26 +0100
parents 43ee4d4d68f2
children 91103995888b
files kallithea/tests/models/test_diff_parsers.py
diffstat 1 files changed, 17 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/kallithea/tests/models/test_diff_parsers.py	Thu Dec 26 16:13:27 2019 +0100
+++ b/kallithea/tests/models/test_diff_parsers.py	Thu Dec 26 11:29:26 2019 +0100
@@ -292,23 +292,24 @@
         #from pprint import pprint; pprint(chunks[1])
         l = ['\n']
         for d in chunks[1]:
+            d['line'] = d['line'].encode()  # not needed for py3
             l.append('%(action)-7s %(new_lineno)3s %(old_lineno)3s %(line)r\n' % d)
         s = ''.join(l)
         assert s == r'''
-context ... ... u'@@ -51,6 +51,13 @@\n'
-unmod    51  51 u'<u>\t</u>begin();\n'
-unmod    52  52 u'<u>\t</u>\n'
-add      53     u'<u>\t</u>int foo;<u class="cr"></u>\n'
-add      54     u'<u>\t</u>int bar; <u class="cr"></u>\n'
-add      55     u'<u>\t</u>int baz;<u>\t</u><u class="cr"></u>\n'
-add      56     u'<u>\t</u>int space; <i></i>'
-add      57     u'<u>\t</u>int tab;<u>\t</u>\n'
-add      58     u'<u>\t</u>\n'
-unmod    59  53 u' <i></i>'
-del          54 u'<u>\t</u>#define MAX_STEPS (48)\n'
-add      60     u'<u>\t</u><u class="cr"></u>\n'
-add      61     u'<u>\t</u>#define MAX_STEPS (64)<u class="cr"></u>\n'
-unmod    62  55 u'\n'
-del          56 u'<u>\t</u>#define MIN_STEPS (<del>48</del>)\n'
-add      63     u'<u>\t</u>#define MIN_STEPS (<ins>42</ins>)\n'
+context ... ... '@@ -51,6 +51,13 @@\n'
+unmod    51  51 '<u>\t</u>begin();\n'
+unmod    52  52 '<u>\t</u>\n'
+add      53     '<u>\t</u>int foo;<u class="cr"></u>\n'
+add      54     '<u>\t</u>int bar; <u class="cr"></u>\n'
+add      55     '<u>\t</u>int baz;<u>\t</u><u class="cr"></u>\n'
+add      56     '<u>\t</u>int space; <i></i>'
+add      57     '<u>\t</u>int tab;<u>\t</u>\n'
+add      58     '<u>\t</u>\n'
+unmod    59  53 ' <i></i>'
+del          54 '<u>\t</u>#define MAX_STEPS (48)\n'
+add      60     '<u>\t</u><u class="cr"></u>\n'
+add      61     '<u>\t</u>#define MAX_STEPS (64)<u class="cr"></u>\n'
+unmod    62  55 '\n'
+del          56 '<u>\t</u>#define MIN_STEPS (<del>48</del>)\n'
+add      63     '<u>\t</u>#define MIN_STEPS (<ins>42</ins>)\n'
 '''