Test server fixes#132
Merged
seancribbs merged 2 commits intobasho:masterfrom Jun 22, 2012
pteichman:test-server-fixes
Merged
Conversation
Without a proper path to erl_src, the TestServer memory backends aren't included and TestServer cannot start.
This fixes a few NameError exceptions when attempting to use TestServer, which attempts to create socket connections and handle socket.error without importing it.
|
@pteichman Looks good, thanks! |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Two minor fixes for the test server:
The erl_src files for the in-memory test store are included in setup.py, which gets them installed if they're present, but there's a bad path to them in MANIFEST.in so they aren't included in the source distribution.
riak/test_server.py attempts to use socket (socket.create_connection() & socket.error) without importing it.