Merge pull request #1619 from HageMaster3108/bugfix/use-python-builtin-open-method-to-create-lockfile-to-workaround-docker-virtiofs-permission-issue

Byron · web-flow · commit a1c472bd314f · 2023-09-01T08:35:00.000+02:00
#1566 Creating a lock now uses python built-in "open()" method to work arou…
diff --git a/git/util.py b/git/util.py
@@ -935,11 +935,7 @@ def _obtain_lock_or_raise(self) -> None:
             )
 
         try:
-            flags = os.O_WRONLY | os.O_CREAT | os.O_EXCL
-            if is_win:
-                flags |= os.O_SHORT_LIVED
-            fd = os.open(lock_file, flags, 0)
-            os.close(fd)
+            open(lock_file, mode='w', closefd=True)
         except OSError as e:
             raise IOError(str(e)) from e
 
diff --git a/test/test_repo.py b/test/test_repo.py
@@ -13,7 +13,7 @@
 import pickle
 import sys
 import tempfile
-from unittest import mock, skipIf, SkipTest
+from unittest import mock, skipIf, SkipTest, skip
 
 import pytest
 
@@ -251,6 +251,7 @@ def test_clone_from_with_path_contains_unicode(self):
                 self.fail("Raised UnicodeEncodeError")
 
     @with_rw_directory
+    @skip("the referenced repository was removed, and one needs to setup a new password controlled repo under the orgs control")
     def test_leaking_password_in_clone_logs(self, rw_dir):
         password = "fakepassword1234"
         try:
