summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKostis Anagnostopoulos <ankostis@gmail.com>2016-10-16 22:02:51 +0200
committerKostis Anagnostopoulos <ankostis@gmail.com>2016-10-16 22:06:10 +0200
commit5962373da1444d841852970205bff77d5ca9377f (patch)
treead6d5d57fd700ebb7beb4ab3e3686d8791ccc093
parentec731f448d304dfe1f9269cc94de405aeb3a0665 (diff)
downloadgitpython-5962373da1444d841852970205bff77d5ca9377f.tar.gz
cygwin, appveyor, #533: Enable actual failures, hide certain 2+2 cases
-rw-r--r--.appveyor.yml2
m---------git/ext/gitdb0
-rw-r--r--git/test/test_index.py11
-rw-r--r--git/test/test_repo.py8
-rw-r--r--git/test/test_submodule.py30
5 files changed, 42 insertions, 9 deletions
diff --git a/.appveyor.yml b/.appveyor.yml
index 0237d2e5..701fc4ac 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -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
diff --git a/git/ext/gitdb b/git/ext/gitdb
-Subproject 38866bc7c4956170c681a62c4508f934ac82646
+Subproject 97035c64f429c229629c25becc54ae44dd95e49
diff --git a/git/test/test_index.py b/git/test/test_index.py
index 99b35db7..1abe22f4 100644
--- a/git/test/test_index.py
+++ b/git/test/test_index.py
@@ -26,7 +26,7 @@ from git import (
GitCommandError,
CheckoutError,
)
-from git.compat import string_types, is_win
+from git.compat import string_types, is_win, PY3
from git.exc import (
HookExecutionError,
InvalidGitRepositoryError
@@ -49,6 +49,7 @@ from git.util import HIDE_WINDOWS_KNOWN_ERRORS, hex_to_bin
from gitdb.base import IStream
import os.path as osp
+from git.cmd import Git
class TestIndex(TestBase):
@@ -405,6 +406,12 @@ class TestIndex(TestBase):
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
@@ -823,7 +830,7 @@ class TestIndex(TestBase):
asserted = True
assert asserted, "Adding using a filename is not correctly asserted."
- @skipIf(HIDE_WINDOWS_KNOWN_ERRORS and sys.version_info[:2] == (2, 7), r"""
+ @skipIf(HIDE_WINDOWS_KNOWN_ERRORS and not PY3, r"""
FIXME: File "C:\projects\gitpython\git\util.py", line 125, in to_native_path_linux
return path.replace('\\', '/')
UnicodeDecodeError: 'ascii' codec can't decode byte 0xc3 in position 0: ordinal not in range(128)""")
diff --git a/git/test/test_repo.py b/git/test/test_repo.py
index 95bc8a96..8b644f7f 100644
--- a/git/test/test_repo.py
+++ b/git/test/test_repo.py
@@ -411,6 +411,14 @@ class TestRepo(TestBase):
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((
diff --git a/git/test/test_submodule.py b/git/test/test_submodule.py
index bbf242c0..fcaad04b 100644
--- a/git/test/test_submodule.py
+++ b/git/test/test_submodule.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
# This module is part of GitPython and is released under
# the BSD License: http://www.opensource.org/licenses/bsd-license.php
import os
@@ -6,24 +7,34 @@ from unittest.case import skipIf
import git
from git.cmd import Git
-from git.compat import string_types, is_win
+from git.compat import (
+ string_types,
+ is_win,
+)
from git.exc import (
InvalidGitRepositoryError,
RepositoryDirtyError
)
from git.objects.submodule.base import Submodule
-from git.objects.submodule.root import RootModule, RootUpdateProgress
+from git.objects.submodule.root import (
+ RootModule,
+ RootUpdateProgress,
+)
from git.repo.fun import (
find_git_dir,
- touch
+ touch,
)
from git.test.lib import (
TestBase,
- with_rw_repo
+ with_rw_repo,
)
from git.test.lib import with_rw_directory
-from git.util import HIDE_WINDOWS_KNOWN_ERRORS
-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
@@ -673,6 +684,13 @@ class TestSubmodule(TestBase):
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'))