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

Fixes for FreeBSD kernel #109

Merged
merged 1 commit into from
Aug 2, 2016
Merged

Conversation

chriskuehl
Copy link
Contributor

This gets dumb-init tests passing on Debian jessie's kfreebsd amd64 port.

root@debian:~/dumb-init# tox
GLOB sdist-make: /root/dumb-init/setup.py
py26 create: /root/dumb-init/.tox/py26
ERROR: InterpreterNotFound: python2.6
py27 create: /root/dumb-init/.tox/py27
py27 installdeps: -r/root/dumb-init/requirements-dev.txt
py27 inst: /root/dumb-init/.tox/dist/dumb-init-1.1.2.zip
py27 runtests: PYTHONHASHSEED='1783920667'
py27 runtests: commands[0] | python -m pytest
=============================================== test session starts ================================================
platform gnukfreebsd9 -- Python 2.7.9, pytest-2.9.2, py-1.4.31, pluggy-0.3.1
rootdir: /root/dumb-init, inifile: pytest.ini
plugins: timeout-1.0.0
collected 173 items

tests/child_processes_test.py ........................
tests/cli_test.py ......................................................................
tests/exit_status_test.py ................................................
tests/proxies_signals_test.py ..........................
tests/shell_background_test.py ....
tests/tty_test.py .

============================================ 173 passed in 8.77 seconds ============================================
py27 runtests: commands[1] | pre-commit run --all-files
autopep8 wrapper.............................................................................................Passed
Check for added large files..................................................................................Passed
Check docstring is first.....................................................................................Passed
Check for merge conflicts....................................................................................Passed
Check Yaml...................................................................................................Passed
Debug Statements (Python)....................................................................................Passed
Detect Private Key...........................................................................................Passed
Fix double quoted strings....................................................................................Passed
Fix End of Files.............................................................................................Passed
Flake8.......................................................................................................Passed
Tests should end in _test.py.................................................................................Passed
Fix requirements.txt.........................................................................................Passed
Trim Trailing Whitespace.....................................................................................Passed
Reorder python imports.......................................................................................Passed
Tabs remover.................................................................................................Passed
py34 create: /root/dumb-init/.tox/py34
py34 installdeps: -r/root/dumb-init/requirements-dev.txt
py34 inst: /root/dumb-init/.tox/dist/dumb-init-1.1.2.zip
py34 runtests: PYTHONHASHSEED='1783920667'
py34 runtests: commands[0] | python -m pytest
=============================================== test session starts ================================================
platform gnukfreebsd9 -- Python 3.4.2, pytest-2.9.2, py-1.4.31, pluggy-0.3.1
rootdir: /root/dumb-init, inifile: pytest.ini
plugins: timeout-1.0.0
collected 173 items

tests/child_processes_test.py ........................
tests/cli_test.py ......................................................................
tests/exit_status_test.py ................................................
tests/proxies_signals_test.py ..........................
tests/shell_background_test.py ....
tests/tty_test.py .

=========================================== 173 passed in 10.70 seconds ============================================
py34 runtests: commands[1] | pre-commit run --all-files
autopep8 wrapper.............................................................................................Passed
Check for added large files..................................................................................Passed
Check docstring is first.....................................................................................Passed
Check for merge conflicts....................................................................................Passed
Check Yaml...................................................................................................Passed
Debug Statements (Python)....................................................................................Passed
Detect Private Key...........................................................................................Passed
Fix double quoted strings....................................................................................Passed
Fix End of Files.............................................................................................Passed
Flake8.......................................................................................................Passed
Tests should end in _test.py.................................................................................Passed
Fix requirements.txt.........................................................................................Passed
Trim Trailing Whitespace.....................................................................................Passed
Reorder python imports.......................................................................................Passed
Tabs remover.................................................................................................Passed
_____________________________________________________ summary ______________________________________________________
ERROR:   py26: InterpreterNotFound: python2.6
  py27: commands succeeded
  py34: commands succeeded

@@ -29,7 +29,7 @@ def readall(fd):
return result
else:
raise
if chunk == '':
if chunk == b'':
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this also explains why this test was flaky on Python 3.

@chriskuehl
Copy link
Contributor Author

This should fix the last part of #107.

@asottile
Copy link
Contributor

asottile commented Aug 2, 2016

Looks right to me :shipit:

@chriskuehl chriskuehl merged commit 301eedd into Yelp:master Aug 2, 2016
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.

2 participants