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

@@ @@ -33,25 +33,25 @@ from kallithea.model.user import UserMod @@
 from kallithea.model.repo_group import RepoGroupModel
 from kallithea.model.user_group import UserGroupModel
 from kallithea.model.gist import GistModel
 from kallithea.model.scm import ScmModel
 from kallithea.model.comment import ChangesetCommentsModel
 from kallithea.model.changeset_status import ChangesetStatusModel
 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')
 def error_function(*args, **kwargs):
     raise Exception('Total Crash !')
 class Fixture(object):
@@ @@ -284,25 +284,25 @@ class Fixture(object): @@
             if strip:
                 source = source.strip()
         return source
     def commit_change(self, repo, filename, content, message, vcs_type,
                       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
+                }
+            }
             cs = ScmModel().create_nodes(
                 user=TEST_USER_ADMIN_LOGIN, repo=repo,
                 message=message,
                 nodes=nodes,
                 parent_cs=_cs,

kallithea/tests/vcs/test_inmemchangesets.py

➞

Show inline comments

@@ @@ -309,25 +309,25 @@ class InMemoryChangesetTestMixin(object) @@
         self.assertEqual(len(self.repo.revisions), N)
         # Check commit number for recreated repo
         backend = self.get_backend()
         repo = backend(self.repo_path)
         self.assertEqual(len(repo.revisions), N)
     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):
     """
     Base test class for tests which requires repository.
     """
     backend_alias = 'hg'
     commits = [
+        {
             'message': 'Initial commit',

setup.py

➞

Show inline comments

@@ @@ -47,25 +47,25 @@ requirements = [ @@
     "formencode>=1.2.4,<=1.2.6",
     "SQLAlchemy>=1.1,<1.2",
     "Mako>=0.9.0,<=1.0.0",
     "pygments>=1.5",
     "whoosh>=2.5.0,<=2.5.7",
     "celery>=3.1,<3.2",
     "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):
     requirements.append("importlib==1.0.1")
     requirements.append("argparse")
 if not is_windows:
     requirements.append("bcrypt>=3.1.0")

0 comments (0 inline, 0 general)