Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 6 additions & 3 deletions jsonrpyc/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -713,9 +713,12 @@ def run(self) -> None:
# handle new lines if any
if lines:
for b_line in lines:
line = b_line.decode("utf-8").strip()
if line:
self.rpc._handle(line)
if not b_line:
self.stop()
else:
line = b_line.decode("utf-8").strip()
if line:
self.rpc._handle(line)
else:
self._stop.wait(self.interval)

Expand Down
20 changes: 18 additions & 2 deletions tests/test_rpc.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import os
import unittest
from subprocess import Popen, PIPE
from time import sleep

import jsonrpyc

Expand All @@ -26,11 +27,26 @@ def __init__(self, *args, **kwargs):
self.rpc = jsonrpyc.RPC(stdout=self.p.stdin, stdin=self.p.stdout)

def __del__(self):
self.p.stdin.close()
self.p.stdout.close()
try:
self.p.stdin.close()
except OSError:
pass
try:
self.p.stdout.close()
except OSError:
pass
self.p.terminate()
self.p.wait()

def test_orphan_exits(self):
self.p.terminate()
self.p.wait(timeout=1)
for _ in range(5):
if self.rpc.watchdog._stop.is_set():
break
sleep(0.05)
self.assertTrue(self.rpc.watchdog._stop.is_set())

def test_request_wo_args(self):
def cb(err, one):
self.assertEqual(err, None)
Expand Down