Skip to content

Commit

Permalink
fixes #37 - DaemonService get_cmd_pipe handles bytes readlines
Browse files Browse the repository at this point in the history
  • Loading branch information
gerardpuig committed May 14, 2020
1 parent 3287bce commit 24de3b6
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 1 deletion.
Empty file added tests/daemon/__init__.py
Empty file.
33 changes: 33 additions & 0 deletions tests/daemon/test_service.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
import mock
import unittest

from ubuntucleaner.daemon.service import DaemonService


class TestDaemonService(unittest.TestCase):

def test_get_cmd_pipe_no_process(self):
with mock.patch.object(DaemonService, '__init__') as mocked_service:
mocked_service.return_value = None

mocked_service = DaemonService()
assert mocked_service.get_cmd_pipe() == ('', 'None')

def test_get_cmd_pipe_terminaled_none(self):
with mock.patch.object(DaemonService, '__init__') as mocked_service:
mocked_service.return_value = None

mocked_service = DaemonService()
mocked_service.p = mock.Mock()
mocked_service.p.poll.return_value = None
mocked_service.p.stdout.readline.return_value = "test"
assert mocked_service.get_cmd_pipe() == ('test', 'None')

def test_get_cmd_pipe_terminaled(self):
with mock.patch.object(DaemonService, '__init__') as mocked_service:
mocked_service.return_value = None

mocked_service = DaemonService()
mocked_service.p = mock.Mock()
mocked_service.p.stdout.readlines.return_value = [b'test', b'stdout']
assert mocked_service.get_cmd_pipe()[0] == b'test stdout'
2 changes: 1 addition & 1 deletion ubuntucleaner/daemon/service.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ def get_cmd_pipe(self):
except:
return '', 'None'
else:
strings, returncode = ''.join(self.p.stdout.readlines()), str(terminaled)
strings, returncode = b' '.join(self.p.stdout.readlines()), str(terminaled)
self.p = None
return strings, returncode
else:
Expand Down

0 comments on commit 24de3b6

Please sign in to comment.