summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcrvi <crvisqr@gmail.com>2020-08-13 21:20:31 +0530
committercrvi <crvisqr@gmail.com>2020-08-14 03:44:02 +0530
commit04f0e41e1ed8ad19c9f0d3e19efe208ec4e144b0 (patch)
treee845fed5b6d75aa29f879ff004db8741b3c8d5b2
parentb8e764b89cfad88a6fe34a17937398a442e74ab7 (diff)
downloadzeitgeist-04f0e41e1ed8ad19c9f0d3e19efe208ec4e144b0.tar.gz
test: fix "TypeError: a bytes-like object is required, not 'str'"
-rw-r--r--test/dbus/testutils.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/test/dbus/testutils.py b/test/dbus/testutils.py
index d9f3a8c9..84aee2d1 100644
--- a/test/dbus/testutils.py
+++ b/test/dbus/testutils.py
@@ -143,7 +143,7 @@ class RemoteTestCase (unittest.TestCase):
def _get_pid(matching_string):
p1 = Popen(["ps", "aux"], stdout=PIPE, stderr=PIPE)
p2 = Popen(["grep", matching_string], stdin=p1.stdout, stderr=PIPE, stdout=PIPE)
- return p2.communicate()[0]
+ return p2.communicate()[0].decode()
@staticmethod
def _safe_start_subprocess(cmd, env, timeout=1, error_callback=None):
@@ -171,6 +171,7 @@ class RemoteTestCase (unittest.TestCase):
env = os.environ.copy()
def error_callback(stdout, stderr):
+ stderr = stderr.decode()
if "--replace" in stderr:
return "%r | %s" %(stderr, RemoteTestCase._get_pid(
"./src/zeitgeist-daemon").replace("\n", "|"))