Bitmessage/PyBitmessage-2024-08-21
Archived
2
0
Fork 0
Code Issues 168 Pull Requests 53 Actions Packages Projects Releases 5 Wiki Activity

Make TestAPIShutdown much like TestProcessShutdown

Browse Source 
(this version should pass on Fedora)
This commit is contained in:
Dmitri Bogomolov 2020-11-04 17:35:17 +02:00
parent 66e8dbf621
commit 698123afec
Signed by untrusted user: g1itch
GPG Key ID: 720A756F18DEED13
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/tests/test_api.py
View File

@ -9,12 +9,14 @@ from .common import skip_python3
skip_python3() skip_python3()
import psutil
try: # nosec try: # nosec
from xmlrpclib import ServerProxy, ProtocolError from xmlrpclib import ServerProxy, ProtocolError
except ImportError: except ImportError:
from xmlrpc.client import ServerProxy, ProtocolError from xmlrpc.client import ServerProxy, ProtocolError
from .test_process import TestProcessProto, TestProcessShutdown from .test_process import TestProcessProto
class TestAPIProto(TestProcessProto): class TestAPIProto(TestProcessProto):
@ -34,18 +36,16 @@ class TestAPIProto(TestProcessProto):
time.sleep(1) time.sleep(1)
class TestAPIShutdown(TestAPIProto, TestProcessShutdown): class TestAPIShutdown(TestAPIProto):
"""Separate test case for API command 'shutdown'""" """Separate test case for API command 'shutdown'"""
def test_shutdown(self): def test_shutdown(self):
"""Shutdown the pybitmessage""" """Shutdown the pybitmessage"""
self.assertEqual(self.api.shutdown(), 'done') self.assertEqual(self.api.shutdown(), 'done')
for _ in range(5): try:
if not self.process.is_running(): self.process.wait(20)
break except psutil.TimeoutExpired:
time.sleep(2)
else:
self.fail( self.fail(
'%s has not stopped in 10 sec' % ' '.join(self._process_cmd)) '%s has not stopped in 20 sec' % ' '.join(self._process_cmd))
# TODO: uncovered API commands # TODO: uncovered API commands