Skip to content

Commit

Permalink
cygwin, appveyor, gitpython-developers#533: Enable actual failures, h…
Browse files Browse the repository at this point in the history
…ide certain 2+2 cases
  • Loading branch information
ankostis committed Oct 16, 2016
1 parent b8b039e commit 06fa996
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ build: false

test_script:
- IF "%IS_CYGWIN%" == "yes" (
nosetests -v || echo "Ignoring failures." & EXIT /B 0
nosetests -v
) ELSE (
IF "%PYTHON_VERSION%" == "3.5" (
nosetests -v --with-coverage
Expand Down
2 changes: 1 addition & 1 deletion git/ext/gitdb
7 changes: 7 additions & 0 deletions git/test/test_index.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
from gitdb.base import IStream

import os.path as osp
from git.cmd import Git


class TestIndex(TestBase):
Expand Down Expand Up @@ -405,6 +406,12 @@ def _count_existing(self, repo, files):
return existing
# END num existing helper

@skipIf(HIDE_WINDOWS_KNOWN_ERRORS and Git.is_cygwin(),
"""FIXME: File "C:\projects\gitpython\git\test\test_index.py", line 642, in test_index_mutation
self.assertEqual(fd.read(), link_target)
AssertionError: '!<symlink>\xff\xfe/\x00e\x00t\x00c\x00/\x00t\x00h\x00a\x00t\x00\x00\x00'
!= '/etc/that'
""")
@with_rw_repo('0.1.6')
def test_index_mutation(self, rw_repo):
index = rw_repo.index
Expand Down
8 changes: 8 additions & 0 deletions git/test/test_repo.py
Original file line number Diff line number Diff line change
Expand Up @@ -411,6 +411,14 @@ def test_blame_complex_revision(self, git):
self.assertEqual(len(res), 1)
self.assertEqual(len(res[0][1]), 83, "Unexpected amount of parsed blame lines")

@skipIf(HIDE_WINDOWS_KNOWN_ERRORS and Git.is_cygwin(),
"""FIXME: File "C:\projects\gitpython\git\cmd.py", line 671, in execute
raise GitCommandError(command, status, stderr_value, stdout_value)
GitCommandError: Cmd('git') failed due to: exit code(128)
cmdline: git add 1__��ava verb��ten 1_test _myfile 1_test_other_file
1_��ava-----verb��ten
stderr: 'fatal: pathspec '"1__çava verböten"' did not match any files'
""")
@with_rw_repo('HEAD', bare=False)
def test_untracked_files(self, rwrepo):
for run, (repo_add, is_invoking_git) in enumerate((
Expand Down
25 changes: 12 additions & 13 deletions git/test/test_submodule.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,18 @@
# the BSD License: http://www.opensource.org/licenses/bsd-license.php
import os
import sys
from unittest.case import skipIf

import git
from git.cmd import Git
from git.compat import string_types, is_win
from git.exc import (
InvalidGitRepositoryError,
RepositoryDirtyError
)
from git.exc import InvalidGitRepositoryError, RepositoryDirtyError
from git.objects.submodule.base import Submodule
from git.objects.submodule.root import RootModule, RootUpdateProgress
from git.repo.fun import (
find_git_dir,
touch
)
from git.test.lib import (
TestBase,
with_rw_repo
)
from git.repo.fun import find_git_dir, touch
from git.test.lib import TestBase, with_rw_repo
from git.test.lib import with_rw_directory
from git.util import to_native_path_linux, join_path_native
from git.util import to_native_path_linux, join_path_native, HIDE_WINDOWS_KNOWN_ERRORS

import os.path as osp

Expand Down Expand Up @@ -667,6 +659,13 @@ def test_add_empty_repo(self, rwdir):
url=empty_repo_dir, no_checkout=checkout_mode and True or False)
# end for each checkout mode

@skipIf(HIDE_WINDOWS_KNOWN_ERRORS and Git.is_cygwin(),
"""FIXME: ile "C:\projects\gitpython\git\cmd.py", line 671, in execute
raise GitCommandError(command, status, stderr_value, stdout_value)
GitCommandError: Cmd('git') failed due to: exit code(128)
cmdline: git add 1__Xava verbXXten 1_test _myfile 1_test_other_file 1_XXava-----verbXXten
stderr: 'fatal: pathspec '"1__çava verböten"' did not match any files'
""")
@with_rw_directory
def test_git_submodules_and_add_sm_with_new_commit(self, rwdir):
parent = git.Repo.init(osp.join(rwdir, 'parent'))
Expand Down

0 comments on commit 06fa996

Please sign in to comment.