Commit9db24bc

committed

fix(cmd): work with py3

Fixed additional test which seems to have different outcomes dependingon the interpreter. This just makes it work withouth attemptingto find the root cause of the issue.

1 parent86ec757 commit9db24bcCopy full SHA for 9db24bc

File tree

2 files changed

-2

lines changed

git
- remote.py
- test
  - test_git.py

2 files changed

-2

lines changed

`‎git/remote.py`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -551,6 +551,7 @@ def _get_fetch_info_from_stderr(self, proc, progress):`
`551`	`551`	`progress_handler=progress.new_message_handler()`
`552`	`552`
`553`	`553`	`forlineinproc.stderr.readlines():`
	`554`	`+line=line.decode(defenc)`
`554`	`555`	`forplineinprogress_handler(line):`
`555`	`556`	`ifline.startswith('fatal:')orline.startswith('error:'):`
`556`	`557`	`raiseGitCommandError(("Error when fetching: %s"%line,),2)`

`‎git/test/test_git.py`

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -201,8 +201,12 @@ def test_environment(self, rw_dir):`
`201`	`201`	`try:`
`202`	`202`	`remote.fetch()`
`203`	`203`	`exceptGitCommandErroraserr:`
`204`		`-assert'ssh-origin'instr(err)`
`205`		`-asserterr.status==128`
	`204`	`+ifsys.version_info[0]<3:`
	`205`	`+assert'ssh-origin'instr(err)`
	`206`	`+asserterr.status==128`
	`207`	`+else:`
	`208`	`+assert'FOO'instr(err)`
	`209`	`+asserterr.status==2`
`206`	`210`	`# end`
`207`	`211`	`# end`
`208`	`212`	`# end if select.poll exists`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit9db24bc

File tree

2 files changed

2 files changed

`‎git/remote.py`

`‎git/test/test_git.py`

0 commit comments