kallithea Changeset - 7986422cacb3

Changeset - 7986422cacb3

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Mads Kiilerich - 6 years ago 2019-12-26 11:29:26
mads@kiilerich.com

Grafted from: d5e74bac14a8

tests: avoid unicode u'' repr in test_diff_markup output

It will go away with py3 anyway.

1 file changed with 17 insertions and 16 deletions:

kallithea/tests/models/test_diff_parsers.py

0 comments (0 inline, 0 general)

kallithea/tests/models/test_diff_parsers.py

➞

Show inline comments

@@ @@ -292,23 +292,24 @@ class TestDiffLib(TestController): @@
         #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'
 '''

0 comments (0 inline, 0 general)