Tomáš Chvátal 2020-04-02 11:14:31 +00:00 committed by Git OBS Bridge
parent 25126db0ba
commit 7083924f25
3 changed files with 47 additions and 2 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Apr 2 11:03:10 UTC 2020 - Tomáš Chvátal <tchvatal@suse.com>
- Disable three more tests on git submodules:
* https://github.com/gitpython-developers/GitPython/issues/597
* test-skips.patch
-------------------------------------------------------------------
Mon Mar 30 10:40:09 UTC 2020 - tchvatal@suse.com

View File

@ -85,7 +85,6 @@ git config --global user.name "Your Name"
%doc AUTHORS CHANGES README.md doc/source/*.rst
%dir %{python_sitelib}/git
%{python_sitelib}/git/*
%dir %{python_sitelib}/GitPython-%{version}-py*.egg-info
%{python_sitelib}/GitPython-%{version}-py*.egg-info
%{python_sitelib}/GitPython*
%changelog

View File

@ -40,3 +40,42 @@ Index: GitPython-3.1.0.1582544583.8c9da73/git/test/test_remote.py
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.0.1582544583.8c9da73/git/test/test_submodule.py
===================================================================
--- GitPython-3.1.0.1582544583.8c9da73.orig/git/test/test_submodule.py
+++ GitPython-3.1.0.1582544583.8c9da73/git/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'