##// END OF EJS Templates
fix(caching): fixed problems with Cache query for users....
fix(caching): fixed problems with Cache query for users. The old way of querying caused the user get query to be always cached, and returning old results even in 2fa forms. The new limited query doesn't cache the user object resolving issues

File last commit:

r5178:30100c99 default
r5365:ae8a165b default
Show More
test_diffs.py
826 lines | 24.9 KiB | text/x-python | PythonLexer
project: added all source files and assets
r1
copyrights: updated for 2023
r5088 # Copyright (C) 2010-2023 RhodeCode GmbH
project: added all source files and assets
r1 #
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License, version 3
# (only), as published by the Free Software Foundation.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
# This program is dual-licensed. If you wish to learn more about the
# RhodeCode Enterprise Edition, including its added features, Support services,
# and proprietary license terms, please see https://rhodecode.com/licenses/
import textwrap
dan
Diffs: fixed missing limited diff container display on large diffs
r3409 import mock
project: added all source files and assets
r1 import pytest
dan
Diffs: fixed missing limited diff container display on large diffs
r3409 from rhodecode.lib.codeblocks import DiffSet
project: added all source files and assets
r1 from rhodecode.lib.diffs import (
pylons: fixed code and test suite after removal of pylons.
r2358 DiffProcessor,
project: added all source files and assets
r1 NEW_FILENODE, DEL_FILENODE, MOD_FILENODE, RENAMED_FILENODE,
CHMOD_FILENODE, BIN_FILENODE, COPIED_FILENODE)
code: import fix/pep8
r5178
dan
Diffs: fixed missing limited diff container display on large diffs
r3409 from rhodecode.lib.utils2 import AttributeDict
from rhodecode.lib.vcs.backends.git import GitCommit
code: import fix/pep8
r5178 from rhodecode.tests.fixture import Fixture
from rhodecode.tests import no_newline_id_generator
project: added all source files and assets
r1 from rhodecode.lib.vcs.backends.git.repository import GitDiff
from rhodecode.lib.vcs.backends.hg.repository import MercurialDiff
from rhodecode.lib.vcs.backends.svn.repository import SubversionDiff
fixture = Fixture()
diffs: in case of text lexers don't do any HL because of pygments newline...
r2546 class TestMixedFilenameEncodings(object):
project: added all source files and assets
r1
@pytest.fixture(scope="class")
def raw_diff(self):
return fixture.load_resource(
'hg_diff_mixed_filename_encodings.diff')
pytest: use consistent way of creating a fixture by using pytest.fixture()
r3946 @pytest.fixture()
project: added all source files and assets
r1 def processor(self, raw_diff):
diff = MercurialDiff(raw_diff)
tests: fixed all tests for python3 BIG changes
r5087 processor = DiffProcessor(diff, diff_format='newdiff')
project: added all source files and assets
r1 return processor
def test_filenames_are_decoded_to_unicode(self, processor):
diff_data = processor.prepare()
filenames = [item['filename'] for item in diff_data]
assert filenames == [
u'späcial-utf8.txt', u'sp�cial-cp1252.txt', u'sp�cial-latin1.txt']
def test_raw_diff_is_decoded_to_unicode(self, processor):
diff_data = processor.prepare()
raw_diffs = [item['raw_diff'] for item in diff_data]
new_file_message = u'\nnew file mode 100644\n'
expected_raw_diffs = [
u' a/späcial-utf8.txt b/späcial-utf8.txt' + new_file_message,
u' a/sp�cial-cp1252.txt b/sp�cial-cp1252.txt' + new_file_message,
u' a/sp�cial-latin1.txt b/sp�cial-latin1.txt' + new_file_message]
assert raw_diffs == expected_raw_diffs
def test_as_raw_preserves_the_encoding(self, processor, raw_diff):
assert processor.as_raw() == raw_diff
# TODO: mikhail: format the following data structure properly
DIFF_FIXTURES = [
('hg',
'hg_diff_add_single_binary_file.diff',
[('US Warszawa.jpg', 'A',
{'added': 0,
'deleted': 0,
'binary': True,
tests: fixed all tests for python3 BIG changes
r5087 'old_mode': '',
'new_mode': '100755',
project: added all source files and assets
r1 'ops': {NEW_FILENODE: 'new file 100755',
BIN_FILENODE: 'binary diff hidden'}}),
]),
('hg',
'hg_diff_mod_single_binary_file.diff',
[('US Warszawa.jpg', 'M',
{'added': 0,
'deleted': 0,
'binary': True,
tests: fixed all tests for python3 BIG changes
r5087 'old_mode': '',
'new_mode': '',
project: added all source files and assets
r1 'ops': {MOD_FILENODE: 'modified file',
BIN_FILENODE: 'binary diff hidden'}}),
]),
('hg',
'hg_diff_mod_single_file_and_rename_and_chmod.diff',
[('README', 'M',
{'added': 3,
'deleted': 0,
'binary': False,
tests: fixed all tests for python3 BIG changes
r5087 'old_mode': '100755',
'new_mode': '100644',
'renamed': ('README.rst', 'README'),
project: added all source files and assets
r1 'ops': {MOD_FILENODE: 'modified file',
RENAMED_FILENODE: 'file renamed from README.rst to README',
CHMOD_FILENODE: 'modified file chmod 100755 => 100644'}}),
]),
('hg',
diffs: fixed problem with rendering no newline at the end of file markers....
r2252 'hg_diff_no_newline.diff',
[('server.properties', 'M',
{'added': 2,
'deleted': 1,
'binary': False,
tests: fixed all tests for python3 BIG changes
r5087 'old_mode': '',
'new_mode': '',
diffs: fixed problem with rendering no newline at the end of file markers....
r2252 'ops': {MOD_FILENODE: 'modified file'}}),
]),
('hg',
project: added all source files and assets
r1 'hg_diff_mod_file_and_rename.diff',
[('README.rst', 'M',
{'added': 3,
'deleted': 0,
'binary': False,
tests: fixed all tests for python3 BIG changes
r5087 'old_mode': '',
'new_mode': '',
'renamed': ('README', 'README.rst'),
project: added all source files and assets
r1 'ops': {MOD_FILENODE: 'modified file',
RENAMED_FILENODE: 'file renamed from README to README.rst'}}),
]),
('hg',
'hg_diff_del_single_binary_file.diff',
[('US Warszawa.jpg', 'D',
{'added': 0,
'deleted': 0,
'binary': True,
tests: fixed all tests for python3 BIG changes
r5087 'old_mode': '',
'new_mode': '',
project: added all source files and assets
r1 'ops': {DEL_FILENODE: 'deleted file',
BIN_FILENODE: 'binary diff hidden'}}),
]),
('hg',
'hg_diff_chmod_and_mod_single_binary_file.diff',
[('gravatar.png', 'M',
{'added': 0,
'deleted': 0,
'binary': True,
tests: fixed all tests for python3 BIG changes
r5087 'old_mode': '100644',
'new_mode': '100755',
project: added all source files and assets
r1 'ops': {CHMOD_FILENODE: 'modified file chmod 100644 => 100755',
BIN_FILENODE: 'binary diff hidden'}}),
]),
('hg',
'hg_diff_chmod.diff',
[('file', 'M',
{'added': 0,
'deleted': 0,
'binary': True,
tests: fixed all tests for python3 BIG changes
r5087 'old_mode': '100755',
'new_mode': '100644',
project: added all source files and assets
r1 'ops': {CHMOD_FILENODE: 'modified file chmod 100755 => 100644'}}),
]),
('hg',
'hg_diff_rename_file.diff',
[('file_renamed', 'M',
{'added': 0,
'deleted': 0,
'binary': True,
tests: fixed all tests for python3 BIG changes
r5087 'old_mode': '',
'new_mode': '',
'renamed': ('file', 'file_renamed'),
project: added all source files and assets
r1 'ops': {RENAMED_FILENODE: 'file renamed from file to file_renamed'}}),
]),
('hg',
'hg_diff_rename_and_chmod_file.diff',
[('README', 'M',
{'added': 0,
'deleted': 0,
'binary': True,
tests: fixed all tests for python3 BIG changes
r5087 'old_mode': '100644',
'new_mode': '100755',
'renamed': ('README.rst', 'README'),
project: added all source files and assets
r1 'ops': {CHMOD_FILENODE: 'modified file chmod 100644 => 100755',
RENAMED_FILENODE: 'file renamed from README.rst to README'}}),
]),
('hg',
'hg_diff_binary_and_normal.diff',
[('img/baseline-10px.png', 'A',
{'added': 0,
'deleted': 0,
'binary': True,
tests: fixed all tests for python3 BIG changes
r5087 'new_mode': '100644',
'old_mode': '',
project: added all source files and assets
r1 'ops': {NEW_FILENODE: 'new file 100644',
BIN_FILENODE: 'binary diff hidden'}}),
('js/jquery/hashgrid.js', 'A',
{'added': 340,
'deleted': 0,
'binary': False,
tests: fixed all tests for python3 BIG changes
r5087 'new_mode': '100755',
'old_mode': '',
project: added all source files and assets
r1 'ops': {NEW_FILENODE: 'new file 100755'}}),
('index.html', 'M',
{'added': 3,
'deleted': 2,
'binary': False,
tests: fixed all tests for python3 BIG changes
r5087 'new_mode': '',
'old_mode': '',
project: added all source files and assets
r1 'ops': {MOD_FILENODE: 'modified file'}}),
('less/docs.less', 'M',
{'added': 34,
'deleted': 0,
'binary': False,
tests: fixed all tests for python3 BIG changes
r5087 'new_mode': '',
'old_mode': '',
project: added all source files and assets
r1 'ops': {MOD_FILENODE: 'modified file'}}),
('less/scaffolding.less', 'M',
{'added': 1,
'deleted': 3,
'binary': False,
tests: fixed all tests for python3 BIG changes
r5087 'new_mode': '',
'old_mode': '',
project: added all source files and assets
r1 'ops': {MOD_FILENODE: 'modified file'}}),
('readme.markdown', 'M',
{'added': 1,
'deleted': 10,
'binary': False,
tests: fixed all tests for python3 BIG changes
r5087 'new_mode': '',
'old_mode': '',
project: added all source files and assets
r1 'ops': {MOD_FILENODE: 'modified file'}}),
('img/baseline-20px.png', 'D',
{'added': 0,
'deleted': 0,
'binary': True,
tests: fixed all tests for python3 BIG changes
r5087 'new_mode': '',
'old_mode': '',
project: added all source files and assets
r1 'ops': {DEL_FILENODE: 'deleted file',
BIN_FILENODE: 'binary diff hidden'}}),
('js/global.js', 'D',
{'added': 0,
'deleted': 75,
'binary': False,
tests: fixed all tests for python3 BIG changes
r5087 'new_mode': '',
'old_mode': '',
project: added all source files and assets
r1 'ops': {DEL_FILENODE: 'deleted file'}})
]),
('git',
'git_diff_chmod.diff',
[('work-horus.xls', 'M',
{'added': 0,
'deleted': 0,
'binary': True,
tests: fixed all tests for python3 BIG changes
r5087 'old_mode': '100644',
'new_mode': '100755',
project: added all source files and assets
r1 'ops': {CHMOD_FILENODE: 'modified file chmod 100644 => 100755'}})
]),
('git',
dan
diffs: handle paths with quotes in diffs.
r3826 'git_diff_js_chars.diff',
[('\\"><img src=x onerror=prompt(0)>/\\"><img src=x onerror=prompt(1)>.txt', 'M',
{'added': 1,
'deleted': 0,
'binary': False,
tests: fixed all tests for python3 BIG changes
r5087 'old_mode': '',
'new_mode': '100644',
dan
diffs: handle paths with quotes in diffs.
r3826 'ops': {MOD_FILENODE: 'modified file'}})
]),
('git',
project: added all source files and assets
r1 'git_diff_rename_file.diff',
[('file.xls', 'M',
{'added': 0,
'deleted': 0,
'binary': True,
tests: fixed all tests for python3 BIG changes
r5087 'old_mode': '',
'new_mode': '',
'renamed': ('work-horus.xls', 'file.xls'),
project: added all source files and assets
r1 'ops': {
RENAMED_FILENODE: 'file renamed from work-horus.xls to file.xls'}})
]),
('git',
'git_diff_mod_single_binary_file.diff',
[('US Warszawa.jpg', 'M',
{'added': 0,
'deleted': 0,
'binary': True,
tests: fixed all tests for python3 BIG changes
r5087 'old_mode': '',
'new_mode': '',
project: added all source files and assets
r1 'ops': {MOD_FILENODE: 'modified file',
BIN_FILENODE: 'binary diff hidden'}})
]),
('git',
'git_diff_binary_and_normal.diff',
[('img/baseline-10px.png', 'A',
{'added': 0,
'deleted': 0,
'binary': True,
tests: fixed all tests for python3 BIG changes
r5087 'old_mode': '',
'new_mode': '100644',
project: added all source files and assets
r1 'ops': {NEW_FILENODE: 'new file 100644',
BIN_FILENODE: 'binary diff hidden'}}),
('js/jquery/hashgrid.js', 'A',
{'added': 340,
'deleted': 0,
'binary': False,
tests: fixed all tests for python3 BIG changes
r5087 'old_mode': '',
'new_mode': '100755',
project: added all source files and assets
r1 'ops': {NEW_FILENODE: 'new file 100755'}}),
('index.html', 'M',
{'added': 3,
'deleted': 2,
'binary': False,
tests: fixed all tests for python3 BIG changes
r5087 'old_mode': '',
'new_mode': '100644',
project: added all source files and assets
r1 'ops': {MOD_FILENODE: 'modified file'}}),
('less/docs.less', 'M',
{'added': 34,
'deleted': 0,
'binary': False,
tests: fixed all tests for python3 BIG changes
r5087 'old_mode': '',
'new_mode': '100644',
project: added all source files and assets
r1 'ops': {MOD_FILENODE: 'modified file'}}),
('less/scaffolding.less', 'M',
{'added': 1,
'deleted': 3,
'binary': False,
tests: fixed all tests for python3 BIG changes
r5087 'old_mode': '',
'new_mode': '100644',
project: added all source files and assets
r1 'ops': {MOD_FILENODE: 'modified file'}}),
('readme.markdown', 'M',
{'added': 1,
'deleted': 10,
'binary': False,
tests: fixed all tests for python3 BIG changes
r5087 'old_mode': '',
'new_mode': '100644',
project: added all source files and assets
r1 'ops': {MOD_FILENODE: 'modified file'}}),
('img/baseline-20px.png', 'D',
{'added': 0,
'deleted': 0,
'binary': True,
tests: fixed all tests for python3 BIG changes
r5087 'old_mode': '',
'new_mode': '',
project: added all source files and assets
r1 'ops': {DEL_FILENODE: 'deleted file',
BIN_FILENODE: 'binary diff hidden'}}),
('js/global.js', 'D',
{'added': 0,
'deleted': 75,
'binary': False,
tests: fixed all tests for python3 BIG changes
r5087 'old_mode': '',
'new_mode': '',
project: added all source files and assets
r1 'ops': {DEL_FILENODE: 'deleted file'}}),
]),
('hg',
'diff_with_diff_data.diff',
[('vcs/backends/base.py', 'M',
{'added': 18,
'deleted': 2,
'binary': False,
tests: fixed all tests for python3 BIG changes
r5087 'old_mode': '',
'new_mode': '100644',
project: added all source files and assets
r1 'ops': {MOD_FILENODE: 'modified file'}}),
('vcs/backends/git/repository.py', 'M',
{'added': 46,
'deleted': 15,
'binary': False,
tests: fixed all tests for python3 BIG changes
r5087 'old_mode': '',
'new_mode': '100644',
project: added all source files and assets
r1 'ops': {MOD_FILENODE: 'modified file'}}),
('vcs/backends/hg.py', 'M',
{'added': 22,
'deleted': 3,
'binary': False,
tests: fixed all tests for python3 BIG changes
r5087 'old_mode': '',
'new_mode': '100644',
project: added all source files and assets
r1 'ops': {MOD_FILENODE: 'modified file'}}),
('vcs/tests/test_git.py', 'M',
{'added': 5,
'deleted': 5,
'binary': False,
tests: fixed all tests for python3 BIG changes
r5087 'old_mode': '',
'new_mode': '100644',
project: added all source files and assets
r1 'ops': {MOD_FILENODE: 'modified file'}}),
('vcs/tests/test_repository.py', 'M',
{'added': 174,
'deleted': 2,
'binary': False,
tests: fixed all tests for python3 BIG changes
r5087 'old_mode': '',
'new_mode': '100644',
project: added all source files and assets
r1 'ops': {MOD_FILENODE: 'modified file'}}),
]),
('hg',
'hg_diff_copy_file.diff',
[('file2', 'M',
{'added': 0,
'deleted': 0,
'binary': True,
tests: fixed all tests for python3 BIG changes
r5087 'old_mode': '',
'new_mode': '',
'copied': ('file1', 'file2'),
project: added all source files and assets
r1 'ops': {COPIED_FILENODE: 'file copied from file1 to file2'}}),
]),
('hg',
'hg_diff_copy_and_modify_file.diff',
[('file3', 'M',
{'added': 1,
'deleted': 0,
'binary': False,
tests: fixed all tests for python3 BIG changes
r5087 'old_mode': '',
'new_mode': '',
'copied': ('file2', 'file3'),
project: added all source files and assets
r1 'ops': {COPIED_FILENODE: 'file copied from file2 to file3',
MOD_FILENODE: 'modified file'}}),
]),
('hg',
'hg_diff_copy_and_chmod_file.diff',
[('file4', 'M',
{'added': 0,
'deleted': 0,
'binary': True,
tests: fixed all tests for python3 BIG changes
r5087 'old_mode': '100644',
'new_mode': '100755',
'copied': ('file3', 'file4'),
project: added all source files and assets
r1 'ops': {COPIED_FILENODE: 'file copied from file3 to file4',
CHMOD_FILENODE: 'modified file chmod 100644 => 100755'}}),
]),
('hg',
'hg_diff_copy_chmod_and_edit_file.diff',
[('file5', 'M',
{'added': 2,
'deleted': 1,
'binary': False,
tests: fixed all tests for python3 BIG changes
r5087 'old_mode': '100755',
'new_mode': '100644',
'copied': ('file4', 'file5'),
project: added all source files and assets
r1 'ops': {COPIED_FILENODE: 'file copied from file4 to file5',
CHMOD_FILENODE: 'modified file chmod 100755 => 100644',
MOD_FILENODE: 'modified file'}})]),
# Diffs to validate rename and copy file with space in its name
('git',
'git_diff_rename_file_with_spaces.diff',
[('file_with_ two spaces.txt', 'M',
{'added': 0,
'deleted': 0,
'binary': True,
tests: fixed all tests for python3 BIG changes
r5087 'old_mode': '',
'new_mode': '',
'renamed': ('file_with_ spaces.txt', 'file_with_ two spaces.txt'),
project: added all source files and assets
r1 'ops': {
RENAMED_FILENODE: (
'file renamed from file_with_ spaces.txt to file_with_ '
' two spaces.txt')}
}), ]),
('hg',
'hg_diff_rename_file_with_spaces.diff',
[('file_changed _.txt', 'M',
{'added': 0,
'deleted': 0,
'binary': True,
tests: fixed all tests for python3 BIG changes
r5087 'old_mode': '',
'new_mode': '',
'renamed': ('file_ with update.txt', 'file_changed _.txt'),
project: added all source files and assets
r1 'ops': {
RENAMED_FILENODE: (
tests: fixed all tests for python3 BIG changes
r5087 'file renamed from file_ with update.txt to file_changed _.txt')}
project: added all source files and assets
r1 }), ]),
('hg',
'hg_diff_copy_file_with_spaces.diff',
[('file_copied_ with spaces.txt', 'M',
{'added': 0,
'deleted': 0,
'binary': True,
tests: fixed all tests for python3 BIG changes
r5087 'old_mode': '',
'new_mode': '',
'copied': ('file_changed_without_spaces.txt', 'file_copied_ with spaces.txt'),
project: added all source files and assets
r1 'ops': {
COPIED_FILENODE: (
'file copied from file_changed_without_spaces.txt to'
' file_copied_ with spaces.txt')}
}),
]),
# special signs from git
('git',
'git_diff_binary_special_files.diff',
[('css/_Icon\\r', 'A',
{'added': 0,
'deleted': 0,
'binary': True,
tests: fixed all tests for python3 BIG changes
r5087 'old_mode': '',
'new_mode': '100644',
project: added all source files and assets
r1 'ops': {NEW_FILENODE: 'new file 100644',
BIN_FILENODE: 'binary diff hidden'}
}),
]),
('git',
'git_diff_binary_special_files_2.diff',
[('css/Icon\\r', 'A',
{'added': 0,
'deleted': 0,
'binary': True,
tests: fixed all tests for python3 BIG changes
r5087 'old_mode': '',
'new_mode': '100644',
project: added all source files and assets
r1 'ops': {NEW_FILENODE: 'new file 100644', }
}),
]),
diffs: compare overhaul....
r1259 ('svn',
'svn_diff_binary_add_file.diff',
[('intl.dll', 'A',
{'added': 0,
'deleted': 0,
'binary': False,
tests: fixed all tests for python3 BIG changes
r5087 'old_mode': '',
'new_mode': '10644',
diffs: compare overhaul....
r1259 'ops': {NEW_FILENODE: 'new file 10644',
#TODO(Marcink): depends on binary detection on svn patches
# BIN_FILENODE: 'binary diff hidden'
}
}),
]),
('svn',
'svn_diff_multiple_changes.diff',
[('trunk/doc/images/SettingsOverlay.png', 'M',
{'added': 0,
'deleted': 0,
'binary': False,
tests: fixed all tests for python3 BIG changes
r5087 'old_mode': '',
'new_mode': '',
diffs: compare overhaul....
r1259 'ops': {MOD_FILENODE: 'modified file',
#TODO(Marcink): depends on binary detection on svn patches
# BIN_FILENODE: 'binary diff hidden'
}
}),
('trunk/doc/source/de/tsvn_ch04.xml', 'M',
{'added': 89,
'deleted': 34,
'binary': False,
tests: fixed all tests for python3 BIG changes
r5087 'old_mode': '',
'new_mode': '',
diffs: compare overhaul....
r1259 'ops': {MOD_FILENODE: 'modified file'}
}),
('trunk/doc/source/en/tsvn_ch04.xml', 'M',
{'added': 66,
'deleted': 21,
'binary': False,
tests: fixed all tests for python3 BIG changes
r5087 'old_mode': '',
'new_mode': '',
diffs: compare overhaul....
r1259 'ops': {MOD_FILENODE: 'modified file'}
}),
('trunk/src/Changelog.txt', 'M',
{'added': 2,
'deleted': 0,
'binary': False,
tests: fixed all tests for python3 BIG changes
r5087 'old_mode': '',
'new_mode': '',
diffs: compare overhaul....
r1259 'ops': {MOD_FILENODE: 'modified file'}
}),
('trunk/src/Resources/TortoiseProcENG.rc', 'M',
{'added': 19,
'deleted': 13,
'binary': False,
tests: fixed all tests for python3 BIG changes
r5087 'old_mode': '',
'new_mode': '',
diffs: compare overhaul....
r1259 'ops': {MOD_FILENODE: 'modified file'}
}),
('trunk/src/TortoiseProc/SetOverlayPage.cpp', 'M',
{'added': 16,
'deleted': 1,
'binary': False,
tests: fixed all tests for python3 BIG changes
r5087 'old_mode': '',
'new_mode': '',
diffs: compare overhaul....
r1259 'ops': {MOD_FILENODE: 'modified file'}
}),
('trunk/src/TortoiseProc/SetOverlayPage.h', 'M',
{'added': 3,
'deleted': 0,
'binary': False,
tests: fixed all tests for python3 BIG changes
r5087 'old_mode': '',
'new_mode': '',
diffs: compare overhaul....
r1259 'ops': {MOD_FILENODE: 'modified file'}
}),
('trunk/src/TortoiseProc/resource.h', 'M',
{'added': 2,
'deleted': 0,
'binary': False,
tests: fixed all tests for python3 BIG changes
r5087 'old_mode': '',
'new_mode': '',
diffs: compare overhaul....
r1259 'ops': {MOD_FILENODE: 'modified file'}
}),
('trunk/src/TortoiseShell/ShellCache.h', 'M',
{'added': 50,
'deleted': 1,
'binary': False,
tests: fixed all tests for python3 BIG changes
r5087 'old_mode': '',
'new_mode': '',
diffs: compare overhaul....
r1259 'ops': {MOD_FILENODE: 'modified file'}
}),
]),
project: added all source files and assets
r1 ]
DIFF_FIXTURES_WITH_CONTENT = [
(
'hg', 'hg_diff_single_file_change_newline.diff',
[
(
'file_b', # filename
'A', # change
{ # stats
'added': 1,
'deleted': 0,
'binary': False,
tests: fixed all tests for python3 BIG changes
r5087 'old_mode': '',
'new_mode': '100644',
project: added all source files and assets
r1 'ops': {NEW_FILENODE: 'new file 100644', }
},
'@@ -0,0 +1 @@\n+test_content b\n' # diff
),
],
),
(
'hg', 'hg_diff_double_file_change_newline.diff',
[
(
'file_b', # filename
'A', # change
{ # stats
'added': 1,
'deleted': 0,
'binary': False,
tests: fixed all tests for python3 BIG changes
r5087 'old_mode': '',
'new_mode': '100644',
project: added all source files and assets
r1 'ops': {NEW_FILENODE: 'new file 100644', }
},
'@@ -0,0 +1 @@\n+test_content b\n' # diff
),
(
'file_c', # filename
'A', # change
{ # stats
'added': 1,
'deleted': 0,
'binary': False,
tests: fixed all tests for python3 BIG changes
r5087 'old_mode': '',
'new_mode': '100644',
project: added all source files and assets
r1 'ops': {NEW_FILENODE: 'new file 100644', }
},
'@@ -0,0 +1 @@\n+test_content c\n' # diff
),
],
),
(
'hg', 'hg_diff_double_file_change_double_newline.diff',
[
(
'file_b', # filename
'A', # change
{ # stats
'added': 1,
'deleted': 0,
'binary': False,
tests: fixed all tests for python3 BIG changes
r5087 'old_mode': '',
'new_mode': '100644',
project: added all source files and assets
r1 'ops': {NEW_FILENODE: 'new file 100644', }
},
'@@ -0,0 +1 @@\n+test_content b\n\n' # diff
),
(
'file_c', # filename
'A', # change
{ # stats
'added': 1,
'deleted': 0,
'binary': False,
tests: fixed all tests for python3 BIG changes
r5087 'old_mode': '',
'new_mode': '100644',
project: added all source files and assets
r1 'ops': {NEW_FILENODE: 'new file 100644', }
},
'@@ -0,0 +1 @@\n+test_content c\n' # diff
),
],
),
(
'hg', 'hg_diff_four_file_change_newline.diff',
[
(
'file', # filename
'A', # change
{ # stats
'added': 1,
'deleted': 0,
'binary': False,
tests: fixed all tests for python3 BIG changes
r5087 'old_mode': '',
'new_mode': '100644',
project: added all source files and assets
r1 'ops': {NEW_FILENODE: 'new file 100644', }
},
'@@ -0,0 +1,1 @@\n+file\n' # diff
),
(
'file2', # filename
'A', # change
{ # stats
'added': 1,
'deleted': 0,
'binary': False,
tests: fixed all tests for python3 BIG changes
r5087 'old_mode': '',
'new_mode': '100644',
project: added all source files and assets
r1 'ops': {NEW_FILENODE: 'new file 100644', }
},
'@@ -0,0 +1,1 @@\n+another line\n' # diff
),
(
'file3', # filename
'A', # change
{ # stats
'added': 1,
'deleted': 0,
'binary': False,
tests: fixed all tests for python3 BIG changes
r5087 'old_mode': '',
'new_mode': '100644',
project: added all source files and assets
r1 'ops': {NEW_FILENODE: 'new file 100644', }
},
'@@ -0,0 +1,1 @@\n+newline\n' # diff
),
(
'file4', # filename
'A', # change
{ # stats
'added': 1,
'deleted': 0,
'binary': False,
tests: fixed all tests for python3 BIG changes
r5087 'old_mode': '',
'new_mode': '100644',
project: added all source files and assets
r1 'ops': {NEW_FILENODE: 'new file 100644', }
},
'@@ -0,0 +1,1 @@\n+fil4\n\\ No newline at end of file' # diff
),
],
),
]
diff_class = {
'git': GitDiff,
'hg': MercurialDiff,
'svn': SubversionDiff,
}
tests: fixed all tests for python3 BIG changes
r5087 @pytest.mark.parametrize('vcs_type, diff_file, expected_data', DIFF_FIXTURES)
def test_diff_lib(vcs_type, diff_file, expected_data):
diff_txt = fixture.load_resource(diff_file)
diff = diff_class[vcs_type](diff_txt)
project: added all source files and assets
r1
tests: fixed all tests for python3 BIG changes
r5087 diff_proc = DiffProcessor(diff, diff_format='newdiff')
project: added all source files and assets
r1 diff_proc_d = diff_proc.prepare()
tests: fixed all tests for python3 BIG changes
r5087 data = [(x['filename'], x['operation'], x['stats'])
for x in diff_proc_d]
project: added all source files and assets
r1 assert expected_data == data
tests: fixed all tests for python3 BIG changes
r5087 @pytest.mark.parametrize('vcs_type, diff_file, expected_data', DIFF_FIXTURES_WITH_CONTENT)
def test_diff_lib_newlines(vcs_type, diff_file, expected_data):
diff_txt = fixture.load_resource(diff_file)
diff = diff_class[vcs_type](diff_txt)
diff_proc = DiffProcessor(diff, diff_format='newdiff')
diff_proc_d = diff_proc.prepare()
data = [(x['filename'], x['operation'], x['stats'], x['raw_diff'])
for x in diff_proc_d]
assert expected_data == data
@pytest.mark.parametrize('input_str', [
b'',
b'\n',
b'\n\n',
b'First\n+second',
b'First\n+second\n',
b'\n\n\n Multi \n\n\n',
b'\n\n\n Multi beginning',
b'Multi end \n\n\n',
b'Multi end',
b'@@ -0,0 +1 @@\n+test_content \n\n b\n'
], ids=no_newline_id_generator)
def test_splitlines(input_str):
result = DiffProcessor.diff_splitter(input_str)
assert list(result) == input_str.splitlines(True)
project: added all source files and assets
r1
dan
Diffs: fixed missing limited diff container display on large diffs
r3409 def test_diff_over_limit(request):
diff_limit = 1024
file_limit = 1024
raw_diff = fixture.load_resource('large_diff.diff')
vcs_diff = GitDiff(raw_diff)
tests: fixed all tests for python3 BIG changes
r5087 diff_processor = DiffProcessor(vcs_diff, diff_format='newdiff',
diff_limit=diff_limit, file_limit=file_limit,
show_full_diff=False)
dan
Diffs: fixed missing limited diff container display on large diffs
r3409
_parsed = diff_processor.prepare()
commit1 = GitCommit(repository=mock.Mock(), raw_id='abcdef12', idx=1)
commit2 = GitCommit(repository=mock.Mock(), raw_id='abcdef34', idx=2)
diffset = DiffSet(
repo_name='repo_name',
source_node_getter=lambda *a, **kw: AttributeDict({'commit': commit1}),
target_node_getter=lambda *a, **kw: AttributeDict({'commit': commit2})
)
diffset = diffset.render_patchset(_parsed, commit1, commit2)
assert len(diffset.files) == 2
assert diffset.limited_diff is True
assert diffset.files[0].patch['filename'] == 'example.go'
assert diffset.files[0].limited_diff is True
assert diffset.files[1].patch['filename'] == 'README.md'
assert diffset.files[1].limited_diff is False