Thanks to visit codestin.com
Credit goes to github.com

Skip to content

stdlib: remove the call function #467

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.

Sign up for GitHub

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

Merged
pirat89 merged 1 commit into from
Apr 4, 2019
Merged

stdlib: remove the call function #467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 0 additions & 24 deletions leapp/libraries/stdlib/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,30 +75,6 @@ def pid(self):
return self._result.get('pid')


def call(args, split=True):
"""
Call an external program, capture and automatically utf-8 decode its output.
Then, suppress output to stderr and redirect to /dev/null.

:param args: Command to execute
:type args: list
:param split: Split the output on newlines
:type split: bool
:return: stdout output, 'utf-8' decoded, split by lines if split=True
:rtype: unicode/str or [unicode/str] if split=True
"""

r = None
with open(os.devnull, mode='w') as err:
if six.PY3:
r = subprocess.check_output(args, stderr=err, encoding='utf-8')
else:
r = subprocess.check_output(args, stderr=err).decode('utf-8')
if split:
return r.splitlines()
return r


def _logging_handler(fd_info, buffer):
"""
Log into either STDOUT or to STDERR.
Expand Down
10 changes: 5 additions & 5 deletions tests/scripts/test_stdlib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
import os

from leapp.libraries.stdlib import call
from leapp.libraries.stdlib import run
from leapp.libraries.stdlib.config import is_debug, is_verbose


def test_check_single_line_output():
a_command = ['echo', 'This a single line test!']
assert call(a_command) == [u'This a single line test!']
assert run(a_command, split=True)['stdout'] == [u'This a single line test!']


def test_check_single_line_output_no_split():
a_command = ['echo', 'This a single line No Split test!']
assert call(a_command, split=False) == u'This a single line No Split test!\n'
assert run(a_command, split=False)['stdout'] == u'This a single line No Split test!\n'


def test_check_multiline_output():
a_command = ['echo', 'This a multi-\nline test!']
assert call(a_command) == [u'This a multi-', u'line test!']
assert run(a_command, split=True)['stdout'] == [u'This a multi-', u'line test!']


def test_check_multiline_output_no_split():
a_command = ['echo', 'This a multi-\nline No Split test!']
assert call(a_command, split=False) == u'This a multi-\nline No Split test!\n'
assert run(a_command, split=False)['stdout'] == u'This a multi-\nline No Split test!\n'


def test_is_verbose(monkeypatch):
Expand Down