Ondřej Súkup
78a8984c32
- refresed test-skips.patch and test_blocking_lock_file-extra-time.patch - used pytest as test runner * bump patch level * Fixed broken file paths. * bump patch level * test: add installation test * tools: update tool scripts after moving tests * MANIFEST.in: update to exclude tests * setup.py: exclude all test files * tests: move to root dir * bump patch level * Revert moving tests out of 'git' folder, related to #1030 * bump patch level * tools: update tool scripts after moving tests * MANIFEST.in: update to exclude tests * setup.py: exclude all test files * tests: move to root dir * Add Ram Rachum to AUTHORS * Fix exception causes all over the codebase * Fix exception causes in 7 modules * Fix exception causes in cmd.py OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-GitPython?expand=0&rev=39
82 lines
4.7 KiB
Diff
82 lines
4.7 KiB
Diff
Index: GitPython-3.1.7.1594621338.176838a3/test/test_base.py
|
|
===================================================================
|
|
--- GitPython-3.1.7.1594621338.176838a3.orig/test/test_base.py
|
|
+++ GitPython-3.1.7.1594621338.176838a3/test/test_base.py
|
|
@@ -111,7 +111,7 @@ class TestBase(TestBase):
|
|
assert not rw_repo.config_reader("repository").getboolean("core", "bare")
|
|
assert osp.isdir(osp.join(rw_repo.working_tree_dir, 'lib'))
|
|
|
|
- #@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.7.1594621338.176838a3/test/test_remote.py
|
|
===================================================================
|
|
--- GitPython-3.1.7.1594621338.176838a3.orig/test/test_remote.py
|
|
+++ GitPython-3.1.7.1594621338.176838a3/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
|
|
from unittest import skipIf
|
|
@@ -408,7 +409,7 @@ class TestRemote(TestBase):
|
|
TagReference.delete(rw_repo, new_tag, other_tag)
|
|
remote.push(":%s" % other_tag.path)
|
|
|
|
- @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
|
|
@@ -641,6 +642,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.7.1594621338.176838a3/test/test_submodule.py
|
|
===================================================================
|
|
--- GitPython-3.1.7.1594621338.176838a3.orig/test/test_submodule.py
|
|
+++ GitPython-3.1.7.1594621338.176838a3/test/test_submodule.py
|
|
@@ -420,12 +420,13 @@ class TestSubmodule(TestBase):
|
|
def test_base_bare(self, rwrepo):
|
|
self._do_base_tests(rwrepo)
|
|
|
|
- @skipIf(HIDE_WINDOWS_KNOWN_ERRORS and sys.version_info[:2] == (3, 5), """
|
|
- 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 and sys.version_info[:2] == (3, 5), """
|
|
+ # 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
|
|
@with_rw_repo(k_subm_current, bare=False)
|
|
+ @skipIf(os.environ.get('SKIP_LOCALHOST', 'false') == 'true', 'git-daemon connection error')
|
|
def test_root_module(self, rwrepo):
|
|
# Can query everything without problems
|
|
rm = RootModule(self.rorepo)
|
|
@@ -750,6 +751,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')
|
|
@@ -825,6 +827,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'
|