Mercurial > kallithea
changeset 7086:438876d818d3
tests: git changeset authors need to have the format 'username <user@example.com>'
New verions of dulwich caused tests like test_compare_forks_on_branch_extra_commits_git
to fail because of this.
Since this is fixed now, re-allow dulwich versions 0.18.6 and newer.
| author | domruf <dominikruf@gmail.com> |
|---|---|
| date | Thu, 11 Jan 2018 19:59:10 +0100 |
| parents | 1c2ba42412e9 |
| children | 1174b9f0afc4 |
| files | kallithea/tests/fixture.py kallithea/tests/vcs/test_inmemchangesets.py setup.py |
| diffstat | 3 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/tests/fixture.py Wed Oct 25 21:12:17 2017 +0200 +++ b/kallithea/tests/fixture.py Thu Jan 11 19:59:10 2018 +0100 @@ -42,7 +42,7 @@ from kallithea.lib.db_manage import DbManage from kallithea.lib.vcs.backends.base import EmptyChangeset from kallithea.tests.base import invalidate_all_caches, GIT_REPO, HG_REPO, \ - TESTS_TMP_PATH, TEST_USER_ADMIN_LOGIN, TEST_USER_REGULAR_LOGIN + TESTS_TMP_PATH, TEST_USER_ADMIN_LOGIN, TEST_USER_REGULAR_LOGIN, TEST_USER_ADMIN_EMAIL log = logging.getLogger(__name__) @@ -293,7 +293,7 @@ if parent is None: _cs = EmptyChangeset(alias=vcs_type) if author is None: - author = TEST_USER_ADMIN_LOGIN + author = '%s <%s>' % (TEST_USER_ADMIN_LOGIN, TEST_USER_ADMIN_EMAIL) if newfile: nodes = {
--- a/kallithea/tests/vcs/test_inmemchangesets.py Wed Oct 25 21:12:17 2017 +0200 +++ b/kallithea/tests/vcs/test_inmemchangesets.py Thu Jan 11 19:59:10 2018 +0100 @@ -318,7 +318,7 @@ self.imc.add(node) date = datetime.datetime(1985, 1, 30, 1, 45) commit = self.imc.commit(u"Committed at time when I was born ;-)", - author=u'lb', date=date) + author=u'lb <lb@example.com>', date=date) self.assertEqual(commit.date, date)
--- a/setup.py Wed Oct 25 21:12:17 2017 +0200 +++ b/setup.py Thu Jan 11 19:59:10 2018 +0100 @@ -56,7 +56,7 @@ "docutils>=0.8.1", "URLObject==2.3.4", "Routes==1.13", - "dulwich>=0.14.1,<0.18.6", # temporary workaround for not using 0.18.6 which cause test failure ... and perhaps also real failures + "dulwich>=0.14.1", "mercurial>=2.9,<4.5", "decorator >= 3.3.2", "Paste >= 2.0.3, < 3.0",