Commit 982eefb
committed
fix(test_git): handle select.poll() missing
In that case, the handler for processing stdout and stderr of the git
process is offloaded to threads. These currently don't return
any exception they raise.
We could easily fix this using an approach as shown
[here](http://goo.gl/hnVax6).1 parent 152a60f commit 982eefb
1 file changed
Lines changed: 10 additions & 6 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -192,10 +192,14 @@ def test_environment(self, rw_dir): | |||
| 192 | 192 | rw_repo = Repo.init(os.path.join(rw_dir, 'repo')) | |
| 193 | 193 | remote = rw_repo.create_remote('ssh-origin', "ssh://git@server/foo") | |
| 194 | 194 | ||
| 195 | - with rw_repo.git.custom_environment(GIT_SSH=path): | ||
| 196 | - try: | ||
| 197 | - remote.fetch() | ||
| 198 | - except GitCommandError as err: | ||
| 199 | - assert 'FOO' in str(err) | ||
| 195 | + # This only works if we are not evaluating git-push/pull output in a thread ! | ||
| 196 | + import select | ||
| 197 | + if hasattr(select, 'poll'): | ||
| 198 | + with rw_repo.git.custom_environment(GIT_SSH=path): | ||
| 199 | + try: | ||
| 200 | + remote.fetch() | ||
| 201 | + except GitCommandError as err: | ||
| 202 | + assert 'FOO' in str(err) | ||
| 203 | + # end | ||
| 200 | 204 | # end | |
| 201 | - # end | ||
| 205 | + # end if select.poll exists | ||
0 commit comments