This repository has been archived by the owner on Nov 5, 2019. It is now read-only.
Add a timeout for GCE detection. #101
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -930,12 +931,22 @@ def _detect_gce_environment(urlopen=None): | |||
| Compute Engine. | |||
| """ | |||
| urlopen = urlopen or urllib.request.urlopen | |||
|
|
|||
| # Note: the explicit `timeout` below is a potentially-short-term | |||
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This is a temporary workaround for googleapis#93, though may end up being the final fix. I did some test cleanup while I was here, switching to `mock`.
|
k, cleaned up and merging. |
craigcitro
added a commit
that referenced
this pull request
Dec 19, 2014
Add a timeout for GCE detection.
|
@craigcitro Are you going to cut a release from this? |
|
lemme get the other one in and i will. |
|
1.4.5 is out. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is a temporary workaround for #93, though may end up being the final fix.
I did some test cleanup while I was here, switching to
mock.PTAL @dhermes