| FazBrowse GitHub Viewer | Trending | | Home |
| Tools: [Download Repo ZIP] [Original HTTPS Page] |
1 parent ec731f4 commit 5962373
5 files changed
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -77,7 +77,7 @@ build: false | |||
| 77 | 77 | ||
| 78 | 78 | test_script: | |
| 79 | 79 | - IF "%IS_CYGWIN%" == "yes" ( | |
| 80 | - nosetests -v || echo "Ignoring failures." & EXIT /B 0 | ||
| 80 | + nosetests -v | ||
| 81 | 81 | ) ELSE ( | |
| 82 | 82 | IF "%PYTHON_VERSION%" == "3.5" ( | |
| 83 | 83 | nosetests -v --with-coverage | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -26,7 +26,7 @@ | |||
| 26 | 26 | GitCommandError, | |
| 27 | 27 | CheckoutError, | |
| 28 | 28 | ) | |
| 29 | - from git.compat import string_types, is_win | ||
| 29 | + from git.compat import string_types, is_win, PY3 | ||
| 30 | 30 | from git.exc import ( | |
| 31 | 31 | HookExecutionError, | |
| 32 | 32 | InvalidGitRepositoryError | |
@@ -49,6 +49,7 @@ | |||
| 49 | 49 | from gitdb.base import IStream | |
| 50 | 50 | ||
| 51 | 51 | import os.path as osp | |
| 52 | + from git.cmd import Git | ||
| 52 | 53 | ||
| 53 | 54 | ||
| 54 | 55 | class TestIndex(TestBase): | |
@@ -405,6 +406,12 @@ def _count_existing(self, repo, files): | |||
| 405 | 406 | return existing | |
| 406 | 407 | # END num existing helper | |
| 407 | 408 | ||
| 409 | + @skipIf(HIDE_WINDOWS_KNOWN_ERRORS and Git.is_cygwin(), | ||
| 410 | + """FIXME: File "C:\projects\gitpython\git\test\test_index.py", line 642, in test_index_mutation | ||
| 411 | + self.assertEqual(fd.read(), link_target) | ||
| 412 | + AssertionError: '!<symlink>\xff\xfe/\x00e\x00t\x00c\x00/\x00t\x00h\x00a\x00t\x00\x00\x00' | ||
| 413 | + != '/etc/that' | ||
| 414 | + """) | ||
| 408 | 415 | @with_rw_repo('0.1.6') | |
| 409 | 416 | def test_index_mutation(self, rw_repo): | |
| 410 | 417 | index = rw_repo.index | |
@@ -823,7 +830,7 @@ def test_index_bare_add(self, rw_bare_repo): | |||
| 823 | 830 | asserted = True | |
| 824 | 831 | assert asserted, "Adding using a filename is not correctly asserted." | |
| 825 | 832 | ||
| 826 | - @skipIf(HIDE_WINDOWS_KNOWN_ERRORS and sys.version_info[:2] == (2, 7), r""" | ||
| 833 | + @skipIf(HIDE_WINDOWS_KNOWN_ERRORS and not PY3, r""" | ||
| 827 | 834 | FIXME: File "C:\projects\gitpython\git\util.py", line 125, in to_native_path_linux | |
| 828 | 835 | return path.replace('\\', '/') | |
| 829 | 836 | UnicodeDecodeError: 'ascii' codec can't decode byte 0xc3 in position 0: ordinal not in range(128)""") | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -411,6 +411,14 @@ def test_blame_complex_revision(self, git): | |||
| 411 | 411 | self.assertEqual(len(res), 1) | |
| 412 | 412 | self.assertEqual(len(res[0][1]), 83, "Unexpected amount of parsed blame lines") | |
| 413 | 413 | ||
| 414 | + @skipIf(HIDE_WINDOWS_KNOWN_ERRORS and Git.is_cygwin(), | ||
| 415 | + """FIXME: File "C:\projects\gitpython\git\cmd.py", line 671, in execute | ||
| 416 | + raise GitCommandError(command, status, stderr_value, stdout_value) | ||
| 417 | + GitCommandError: Cmd('git') failed due to: exit code(128) | ||
| 418 | + cmdline: git add 1__��ava verb��ten 1_test _myfile 1_test_other_file | ||
| 419 | + 1_��ava-----verb��ten | ||
| 420 | + stderr: 'fatal: pathspec '"1__çava verböten"' did not match any files' | ||
| 421 | + """) | ||
| 414 | 422 | @with_rw_repo('HEAD', bare=False) | |
| 415 | 423 | def test_untracked_files(self, rwrepo): | |
| 416 | 424 | for run, (repo_add, is_invoking_git) in enumerate(( | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,3 +1,4 @@ | |||
| 1 | + # -*- coding: utf-8 -*- | ||
| 1 | 2 | # This module is part of GitPython and is released under | |
| 2 | 3 | # the BSD License: http://www.opensource.org/licenses/bsd-license.php | |
| 3 | 4 | import os | |
@@ -6,24 +7,34 @@ | |||
| 6 | 7 | ||
| 7 | 8 | import git | |
| 8 | 9 | from git.cmd import Git | |
| 9 | - from git.compat import string_types, is_win | ||
| 10 | + from git.compat import ( | ||
| 11 | + string_types, | ||
| 12 | + is_win, | ||
| 13 | + ) | ||
| 10 | 14 | from git.exc import ( | |
| 11 | 15 | InvalidGitRepositoryError, | |
| 12 | 16 | RepositoryDirtyError | |
| 13 | 17 | ) | |
| 14 | 18 | from git.objects.submodule.base import Submodule | |
| 15 | - from git.objects.submodule.root import RootModule, RootUpdateProgress | ||
| 19 | + from git.objects.submodule.root import ( | ||
| 20 | + RootModule, | ||
| 21 | + RootUpdateProgress, | ||
| 22 | + ) | ||
| 16 | 23 | from git.repo.fun import ( | |
| 17 | 24 | find_git_dir, | |
| 18 | - touch | ||
| 25 | + touch, | ||
| 19 | 26 | ) | |
| 20 | 27 | from git.test.lib import ( | |
| 21 | 28 | TestBase, | |
| 22 | - with_rw_repo | ||
| 29 | + with_rw_repo, | ||
| 23 | 30 | ) | |
| 24 | 31 | from git.test.lib import with_rw_directory | |
| 25 | - from git.util import HIDE_WINDOWS_KNOWN_ERRORS | ||
| 26 | - from git.util import to_native_path_linux, join_path_native | ||
| 32 | + from git.util import ( | ||
| 33 | + to_native_path_linux, | ||
| 34 | + join_path_native, | ||
| 35 | + HIDE_WINDOWS_KNOWN_ERRORS, | ||
| 36 | + ) | ||
| 37 | + | ||
| 27 | 38 | import os.path as osp | |
| 28 | 39 | ||
| 29 | 40 | ||
@@ -673,6 +684,13 @@ def test_add_empty_repo(self, rwdir): | |||
| 673 | 684 | url=empty_repo_dir, no_checkout=checkout_mode and True or False) | |
| 674 | 685 | # end for each checkout mode | |
| 675 | 686 | ||
| 687 | + @skipIf(HIDE_WINDOWS_KNOWN_ERRORS and Git.is_cygwin(), | ||
| 688 | + """FIXME: ile "C:\projects\gitpython\git\cmd.py", line 671, in execute | ||
| 689 | + raise GitCommandError(command, status, stderr_value, stdout_value) | ||
| 690 | + GitCommandError: Cmd('git') failed due to: exit code(128) | ||
| 691 | + cmdline: git add 1__Xava verbXXten 1_test _myfile 1_test_other_file 1_XXava-----verbXXten | ||
| 692 | + stderr: 'fatal: pathspec '"1__çava verböten"' did not match any files' | ||
| 693 | + """) | ||
| 676 | 694 | @with_rw_directory | |
| 677 | 695 | def test_git_submodules_and_add_sm_with_new_commit(self, rwdir): | |
| 678 | 696 | parent = git.Repo.init(osp.join(rwdir, 'parent')) | |
| Back | FazBrowse Home | New Git URL |
0 commit comments