Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixing tests on Mac #217

Merged
merged 13 commits into from
Sep 15, 2015
Merged

Fixing tests on Mac #217

merged 13 commits into from
Sep 15, 2015

Conversation

henryiii
Copy link
Collaborator

@henryiii henryiii commented Sep 3, 2015

Macs (at least Yosemite) run all the tests without error now, changed several checks for returned text from commands to accept the Mac answer, too.

Also moved captured_stdout, skipIf addition to lib.py, to better support DRY.

@tomerfiliba
Copy link
Owner

@henryiii - there's now a merge conflict with this pull request, and readthedocs complains about build failures: https://readthedocs.org/projects/plumbum/builds/ . can you please have a look?

@henryiii
Copy link
Collaborator Author

The read the docs error was an error on my part (versionadded vs. version-added). The merge conflict is now cleaned up too; the additions were too similar for automatic merging.

I'll see about adding to the changelog next.

@henryiii henryiii added this to the v1.6.0 milestone Sep 15, 2015
tomerfiliba added a commit that referenced this pull request Sep 15, 2015
@tomerfiliba tomerfiliba merged commit 4bd60ea into master Sep 15, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants