108 lines
5.7 KiB
Diff
108 lines
5.7 KiB
Diff
---
|
|
test/test_base.py | 3 ++-
|
|
test/test_remote.py | 5 ++++-
|
|
test/test_repo.py | 1 +
|
|
test/test_submodule.py | 19 +++++++++++--------
|
|
4 files changed, 18 insertions(+), 10 deletions(-)
|
|
|
|
Index: GitPython-3.1.34.1693646983.2a2ae77/test/test_base.py
|
|
===================================================================
|
|
--- GitPython-3.1.34.1693646983.2a2ae77.orig/test/test_base.py
|
|
+++ GitPython-3.1.34.1693646983.2a2ae77/test/test_base.py
|
|
@@ -109,7 +109,8 @@ class TestBase(_TestBase):
|
|
assert osp.isdir(osp.join(rw_repo.working_tree_dir, "lib"))
|
|
assert osp.isdir(rw_repo.working_dir)
|
|
|
|
- @skipIf(HIDE_WINDOWS_FREEZE_ERRORS, "FIXME: Freezes! sometimes...")
|
|
+ #@skipIf(HIDE_WINDOWS_FREEZE_ERRORS, "FIXME: Freezes! sometimes...")
|
|
+ @skipIf(os.environ.get('SKIP_LOCALHOST', 'false') == 'true', 'git-daemon connection error')
|
|
@with_rw_and_rw_remote_repo("0.1.6")
|
|
def test_with_rw_remote_and_rw_repo(self, rw_repo, rw_remote_repo):
|
|
assert not rw_repo.config_reader("repository").getboolean("core", "bare")
|
|
Index: GitPython-3.1.34.1693646983.2a2ae77/test/test_remote.py
|
|
===================================================================
|
|
--- GitPython-3.1.34.1693646983.2a2ae77.orig/test/test_remote.py
|
|
+++ GitPython-3.1.34.1693646983.2a2ae77/test/test_remote.py
|
|
@@ -4,6 +4,7 @@
|
|
# This module is part of GitPython and is released under
|
|
# the BSD License: http://www.opensource.org/licenses/bsd-license.php
|
|
|
|
+import os
|
|
import random
|
|
import tempfile
|
|
import pytest
|
|
@@ -430,7 +431,8 @@ class TestRemote(TestBase):
|
|
TagReference.delete(rw_repo, new_tag, other_tag)
|
|
remote.push(":%s" % other_tag.path, kill_after_timeout=10.0)
|
|
|
|
- @skipIf(HIDE_WINDOWS_FREEZE_ERRORS, "FIXME: Freezes!")
|
|
+ #@skipIf(HIDE_WINDOWS_FREEZE_ERRORS, "FIXME: Freezes!")
|
|
+ @skipIf(os.environ.get('SKIP_LOCALHOST', 'false') == 'true', 'git-daemon connection error')
|
|
@with_rw_and_rw_remote_repo("0.1.6")
|
|
def test_base(self, rw_repo, remote_repo):
|
|
num_remotes = 0
|
|
@@ -681,6 +683,7 @@ class TestRemote(TestBase):
|
|
# will raise fatal: Will not delete all non-push URLs
|
|
self.assertRaises(GitCommandError, remote.delete_url, test3)
|
|
|
|
+ @skipIf(os.environ.get('SKIP_GITHUB', 'false') == 'true', 'GitHub connection error')
|
|
def test_fetch_error(self):
|
|
rem = self.rorepo.remote("origin")
|
|
with self.assertRaisesRegex(GitCommandError, "[Cc]ouldn't find remote ref __BAD_REF__"):
|
|
Index: GitPython-3.1.34.1693646983.2a2ae77/test/test_repo.py
|
|
===================================================================
|
|
--- GitPython-3.1.34.1693646983.2a2ae77.orig/test/test_repo.py
|
|
+++ GitPython-3.1.34.1693646983.2a2ae77/test/test_repo.py
|
|
@@ -250,6 +250,7 @@ class TestRepo(TestBase):
|
|
except UnicodeEncodeError:
|
|
self.fail("Raised UnicodeEncodeError")
|
|
|
|
+ @skipIf(os.environ.get('SKIP_GITHUB', 'false') == 'true', 'Gitlab connection error')
|
|
@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):
|
|
Index: GitPython-3.1.34.1693646983.2a2ae77/test/test_submodule.py
|
|
===================================================================
|
|
--- GitPython-3.1.34.1693646983.2a2ae77.orig/test/test_submodule.py
|
|
+++ GitPython-3.1.34.1693646983.2a2ae77/test/test_submodule.py
|
|
@@ -453,14 +453,15 @@ class TestSubmodule(TestBase):
|
|
reason="Cygwin GitPython can't find submodule SHA",
|
|
raises=ValueError
|
|
)
|
|
- @skipIf(
|
|
- HIDE_WINDOWS_KNOWN_ERRORS,
|
|
- """
|
|
- File "C:\\projects\\gitpython\\git\\cmd.py", line 559, in execute
|
|
- raise GitCommandNotFound(command, err)
|
|
- git.exc.GitCommandNotFound: Cmd('git') not found due to: OSError('[WinError 6] The handle is invalid')
|
|
- cmdline: git clone -n --shared -v C:\\projects\\gitpython\\.git Users\\appveyor\\AppData\\Local\\Temp\\1\\tmplyp6kr_rnon_bare_test_root_module""",
|
|
- ) # noqa E501
|
|
+ #@skipIf(
|
|
+ # HIDE_WINDOWS_KNOWN_ERRORS,
|
|
+ # """
|
|
+ # File "C:\\projects\\gitpython\\git\\cmd.py", line 559, in execute
|
|
+ # raise GitCommandNotFound(command, err)
|
|
+ # git.exc.GitCommandNotFound: Cmd('git') not found due to: OSError('[WinError 6] The handle is invalid')
|
|
+ # cmdline: git clone -n --shared -v C:\\projects\\gitpython\\.git Users\\appveyor\\AppData\\Local\\Temp\\1\\tmplyp6kr_rnon_bare_test_root_module""",
|
|
+ #) # noqa E501
|
|
+ @skipIf(os.environ.get('SKIP_LOCALHOST', 'false') == 'true', 'git-daemon connection error')
|
|
@with_rw_repo(k_subm_current, bare=False)
|
|
def test_root_module(self, rwrepo):
|
|
# Can query everything without problems
|
|
@@ -802,6 +803,7 @@ class TestSubmodule(TestBase):
|
|
# "FIXME: helper.wrapper fails with: PermissionError: [WinError 5] Access is denied: "
|
|
# "'C:\\Users\\appveyor\\AppData\\Local\\Temp\\1\\test_work_tree_unsupportedryfa60di\\master_repo\\.git\\objects\\pack\\pack-bc9e0787aef9f69e1591ef38ea0a6f566ec66fe3.idx") # noqa E501
|
|
@with_rw_directory
|
|
+ @skipIf(os.environ.get('SKIP_LOCALHOST', 'false') == 'true', 'git-daemon connection error')
|
|
def test_git_submodule_compatibility(self, rwdir):
|
|
parent = git.Repo.init(osp.join(rwdir, "parent"))
|
|
sm_path = join_path_native("submodules", "intermediate", "one")
|
|
@@ -887,6 +889,7 @@ class TestSubmodule(TestBase):
|
|
# end for each dry-run mode
|
|
|
|
@with_rw_directory
|
|
+ @skipIf(os.environ.get('SKIP_LOCALHOST', 'false') == 'true', 'git-daemon connection error')
|
|
def test_remove_norefs(self, rwdir):
|
|
parent = git.Repo.init(osp.join(rwdir, "parent"))
|
|
sm_name = "mymodules/myname"
|