mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-01-12 08:56:13 +01:00
Code

- avoid false negative failures due to trivial differences in diff hunk headers

Browse Source 
When a hunk header refers to a single line in the "from"
  file and/or the "to" file, e.g.

    @@ -37,37 +41,43 @@
    @@ -37,39 +41,41 @@
    @@ -37,37 +41,41 @@

  some systems will avoid repeating the line number:

    @@ -37 +41,43 @@
    @@ -37,39 +41 @@
    @@ -37 +41 @@

  so we need to canonise the output to avoid false negative
  test failures.
This commit is contained in:
Adam Spiers 2013-01-18 11:35:47 +00:00
parent 479f5d5011
commit ef0f24c2f6
1 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
tests/test_difffiles.py
View File

@ -1,6 +1,7 @@
import osc.core
import osc.oscerr
import os
import re
from common import GET, OscTestCase
FIXTURES_DIR = os.path.join(os.getcwd(), 'difffile_fixtures')
@ -294,18 +295,42 @@ Binary file 'binary' has changed.
p = osc.core.Package('.')
self.__check_diff(p, '', 3)
def __check_diff(self, p, expected, revision=None):
def __check_diff(self, p, exp, revision=None):
got = ''
for i in p.get_diff(revision):
got += ''.join(i)
if (got + expected).find('\n') == -1:
self.assertEqual(got, expected)
# When a hunk header refers to a single line in the "from"
# file and/or the "to" file, e.g.
#
# @@ -37,37 +41,43 @@
# @@ -37,39 +41,41 @@
# @@ -37,37 +41,41 @@
#
# some systems will avoid repeating the line number:
#
# @@ -37 +41,43 @@
# @@ -37,39 +41 @@
# @@ -37 +41 @@
#
# so we need to canonise the output to avoid false negative
# test failures.
def __canonise_diff(diff):
diff = re.sub('^@@ -(\d+) ', '@@ -\\1,\\1 ', diff, 0, re.MULTILINE)
diff = re.sub('^(@@ -\d+,\d+) \+(\d+) ', '\\1 +\\2,\\2 ', diff, 0, re.MULTILINE)
return diff
got = __canonise_diff(got)
exp = __canonise_diff(exp)
if (got + exp).find('\n') == -1:
self.assertEqual(got, exp)
else:
start_delim = "\n" + (" 8< ".join(["-----"] * 8)) + "\n"
end_delim = "\n" + (" >8 ".join(["-----"] * 8)) + "\n\n"
self.assertEqual(got, expected,
self.assertEqual(got, exp,
"got:" + start_delim + got + end_delim +
"expected:" + start_delim + expected + end_delim)
"expected:" + start_delim + exp + end_delim)
if __name__ == '__main__':
import unittest