summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/test_commit.py15
-rw-r--r--test/test_util.py7
2 files changed, 22 insertions, 0 deletions
diff --git a/test/test_commit.py b/test/test_commit.py
index 82126987..c5a43c94 100644
--- a/test/test_commit.py
+++ b/test/test_commit.py
@@ -509,3 +509,18 @@ JzJMZDRLQLFvnzqZuCjE
assert KEY_1 not in commit.trailers.keys()
assert KEY_2 in commit.trailers.keys()
assert commit.trailers[KEY_2] == VALUE_2
+
+ def test_commit_co_authors(self):
+ commit = copy.copy(self.rorepo.commit("4251bd5"))
+ commit.message = """Commit message
+
+Co-authored-by: Test User 1 <602352+test@users.noreply.github.com>
+Co-authored-by: test_user_2 <another_user-email@github.com>
+Co_authored_by: test_user_x <test@github.com>
+Co-authored-by: test_user_y <test@github.com> text
+Co-authored-by: test_user_3 <test_user_3@github.com>"""
+ assert commit.co_authors == [
+ Actor("Test User 1", "602352+test@users.noreply.github.com"),
+ Actor("test_user_2", "another_user-email@github.com"),
+ Actor("test_user_3", "test_user_3@github.com"),
+ ]
diff --git a/test/test_util.py b/test/test_util.py
index eb016189..90dd89a9 100644
--- a/test/test_util.py
+++ b/test/test_util.py
@@ -6,11 +6,13 @@
import os
import pickle
+import sys
import tempfile
import time
from unittest import mock, skipIf
from datetime import datetime
+import pytest
import ddt
from git.cmd import dashify
@@ -154,6 +156,11 @@ class TestUtils(TestBase):
lock_file._obtain_lock_or_raise()
lock_file._release_lock()
+ @pytest.mark.xfail(
+ sys.platform == "cygwin",
+ reason="Cygwin fails here for some reason, always",
+ raises=AssertionError
+ )
def test_blocking_lock_file(self):
my_file = tempfile.mktemp()
lock_file = BlockingLockFile(my_file)