kallithea Changeset - 438876d818d3

Changeset - 438876d818d3

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

domruf - 8 years ago 2018-01-11 19:59:10
dominikruf@gmail.com

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.

3 files changed with 4 insertions and 4 deletions:

kallithea/tests/fixture.py

kallithea/tests/vcs/test_inmemchangesets.py

setup.py

0 comments (0 inline, 0 general)

kallithea/tests/fixture.py

➞

Show inline comments

@@ @@ -39,13 +39,13 @@ from kallithea.model.changeset_status im @@
 from kallithea.model.pull_request import CreatePullRequestAction#, CreatePullRequestIterationAction, PullRequestModel
 from kallithea.lib import helpers
 from kallithea.lib.auth import AuthUser
 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__)
 FIXTURES = os.path.join(dirname(dirname(os.path.abspath(__file__))), 'tests', 'fixtures')
@@ @@ -290,13 +290,13 @@ class Fixture(object): @@
                       parent=None, newfile=False, author=None):
         repo = Repository.get_by_repo_name(repo)
         _cs = parent
         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 = {
                 filename: {
                     'content': content
+                }

kallithea/tests/vcs/test_inmemchangesets.py

➞

Show inline comments

@@ @@ -315,13 +315,13 @@ class InMemoryChangesetTestMixin(object) @@
     def test_date_attr(self):
         node = FileNode('foobar.txt', content='Foobared!')
         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)
 class BackendBaseTestCase(unittest.TestCase):
     """

setup.py

➞

Show inline comments

@@ @@ -53,13 +53,13 @@ requirements = [ @@
     "babel>=0.9.6,<2.4",
     "python-dateutil>=1.5.0,<2.0.0",
     "markdown==2.2.1",
     "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",
+]
 if sys.version_info < (2, 7):

0 comments (0 inline, 0 general)