⚫ reformat tests and setup.py

Author: gonzalocasas

setup.py

@@ -1,87 +1,71 @@
 #!/usr/bin/env python
 # -*- encoding: utf-8 -*-
-from __future__ import absolute_import
-from __future__ import print_function
+from __future__ import absolute_import, print_function
 
 import io
 import re
 import sys
 from glob import glob
-from os.path import abspath
-from os.path import basename
-from os.path import dirname
-from os.path import join
-from os.path import splitext
+from os.path import abspath, basename, dirname, join, splitext
 
-from setuptools import find_packages
-from setuptools import setup
+from setuptools import find_packages, setup
 
 here = abspath(dirname(__file__))
 
 # If IronPython, we don't require autobahn/twisted
 if sys.platform == "cli":
     requirements = []
 else:
-    requirements = [
-        'autobahn>=17.10',
-        'twisted>=17.9'
-    ]
+    requirements = ["autobahn>=17.10", "twisted>=17.9"]
 
 
 def read(*names, **kwargs):
-    return io.open(
-        join(here, *names),
-        encoding=kwargs.get('encoding', 'utf8')
-    ).read()
+    return io.open(join(here, *names), encoding=kwargs.get("encoding", "utf8")).read()
 
 
 about = {}
-exec(read('src', 'roslibpy', '__version__.py'), about)
+exec(read("src", "roslibpy", "__version__.py"), about)
 
 setup(
-    name=about['__title__'],
-    version=about['__version__'],
-    license=about['__license__'],
-    description=about['__description__'],
-    author=about['__author__'],
-    author_email=about['__author_email__'],
-    url=about['__url__'],
-    long_description='%s\n%s' % (
-        re.compile('^.. start-badges.*^.. end-badges', re.M |
-                   re.S).sub('', read('README.rst')),
-        re.sub(':[a-z]+:`~?(.*?)`', r'``\1``', read('CHANGELOG.rst'))
+    name=about["__title__"],
+    version=about["__version__"],
+    license=about["__license__"],
+    description=about["__description__"],
+    author=about["__author__"],
+    author_email=about["__author_email__"],
+    url=about["__url__"],
+    long_description="%s\n%s"
+    % (
+        re.compile("^.. start-badges.*^.. end-badges", re.M | re.S).sub("", read("README.rst")),
+        re.sub(":[a-z]+:`~?(.*?)`", r"``\1``", read("CHANGELOG.rst")),
     ),
-    packages=find_packages('src'),
-    package_dir={'': 'src'},
-    py_modules=[splitext(basename(path))[0] for path in glob('src/*.py')],
+    packages=find_packages("src"),
+    package_dir={"": "src"},
+    py_modules=[splitext(basename(path))[0] for path in glob("src/*.py")],
     include_package_data=True,
     zip_safe=False,
     classifiers=[
-        'Development Status :: 4 - Beta',
-        'Intended Audience :: Developers',
-        'Intended Audience :: Science/Research',
-        'License :: OSI Approved :: MIT License',
-        'Operating System :: Unix',
-        'Operating System :: POSIX',
-        'Operating System :: Microsoft :: Windows',
-        'Programming Language :: Python',
-        'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.3',
-        'Programming Language :: Python :: 3.4',
-        'Programming Language :: Python :: 3.5',
-        'Programming Language :: Python :: 3.6',
-        'Programming Language :: Python :: 3.7',
-        'Programming Language :: Python :: 3.8',
-        'Programming Language :: Python :: Implementation :: CPython',
-        'Programming Language :: Python :: Implementation :: IronPython',
-        'Topic :: Scientific/Engineering',
+        "Development Status :: 4 - Beta",
+        "Intended Audience :: Developers",
+        "Intended Audience :: Science/Research",
+        "License :: OSI Approved :: MIT License",
+        "Operating System :: Unix",
+        "Operating System :: POSIX",
+        "Operating System :: Microsoft :: Windows",
+        "Programming Language :: Python",
+        "Programming Language :: Python :: 3",
+        "Programming Language :: Python :: 3.3",
+        "Programming Language :: Python :: 3.4",
+        "Programming Language :: Python :: 3.5",
+        "Programming Language :: Python :: 3.6",
+        "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: Implementation :: CPython",
+        "Programming Language :: Python :: Implementation :: IronPython",
+        "Topic :: Scientific/Engineering",
     ],
-    keywords=['ros', 'ros-bridge', 'robotics', 'websockets'],
+    keywords=["ros", "ros-bridge", "robotics", "websockets"],
     install_requires=requirements,
     extras_require={},
-    entry_points={
-        'console_scripts': [
-            'roslibpy=roslibpy.__main__:main'
-        ]
-    },
+    entry_points={"console_scripts": ["roslibpy=roslibpy.__main__:main"]},
 )

tests/ipy_test_runner.py

@@ -14,5 +14,5 @@
 
 HERE = os.path.dirname(__file__)
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     pytest.run(HERE)

tests/test_core.py

@@ -1,7 +1,6 @@
 import pytest
 
-from roslibpy import Header
-from roslibpy import Time
+from roslibpy import Header, Time
 
 REF_FLOAT_SECS_TIME = 1610122759.677662
 
@@ -29,16 +28,16 @@ def test_is_zero():
 
 def test_header_ctor_supports_time():
     header = Header(seq=1, stamp=Time.from_sec(REF_FLOAT_SECS_TIME))
-    assert header['stamp']['secs'] == 1610122759
-    assert header['stamp']['secs'] == header['stamp'].secs
-    assert header['stamp'].to_sec() == REF_FLOAT_SECS_TIME
+    assert header["stamp"]["secs"] == 1610122759
+    assert header["stamp"]["secs"] == header["stamp"].secs
+    assert header["stamp"].to_sec() == REF_FLOAT_SECS_TIME
 
 
 def test_header_ctor_supports_dict():
     header = Header(seq=1, stamp=dict(secs=1610122759, nsecs=677661895))
-    assert header['stamp']['secs'] == 1610122759
-    assert header['stamp']['secs'] == header['stamp'].secs
-    assert header['stamp'].to_sec() == REF_FLOAT_SECS_TIME
+    assert header["stamp"]["secs"] == 1610122759
+    assert header["stamp"]["secs"] == header["stamp"].secs
+    assert header["stamp"].to_sec() == REF_FLOAT_SECS_TIME
 
 
 def test_time_accepts_only_ints():

tests/test_param.py

@@ -1,16 +1,15 @@
-from roslibpy import Param
-from roslibpy import Ros
+from roslibpy import Param, Ros
 
 
 def test_param_manipulation():
-    ros = Ros('127.0.0.1', 9090)
+    ros = Ros("127.0.0.1", 9090)
     ros.run()
 
-    param = Param(ros, 'test_param')
+    param = Param(ros, "test_param")
     assert param.get() is None
 
-    param.set('test_value')
-    assert param.get() == 'test_value'
+    param.set("test_value")
+    assert param.get() == "test_value"
 
     param.delete()
     assert param.get() is None

tests/test_ros.py

@@ -5,9 +5,9 @@
 
 from roslibpy import Ros
 
-host = '127.0.0.1'
+host = "127.0.0.1"
 port = 9090
-url = u'ws://%s:%d' % (host, port)
+url = "ws://%s:%d" % (host, port)
 
 
 def test_reconnect_does_not_trigger_on_client_close():
@@ -17,7 +17,7 @@ def test_reconnect_does_not_trigger_on_client_close():
     assert ros.is_connected, "ROS initially connected"
     time.sleep(0.5)
     event = threading.Event()
-    ros.on('close', lambda m: event.set())
+    ros.on("close", lambda m: event.set())
     ros.close()
     event.wait(5)
 
@@ -45,16 +45,16 @@ def test_closing_event():
     ctx = dict(closing_event_called=False, was_still_connected=False)
 
     def handle_closing():
-        ctx['closing_event_called'] = True
-        ctx['was_still_connected'] = ros.is_connected
+        ctx["closing_event_called"] = True
+        ctx["was_still_connected"] = ros.is_connected
         time.sleep(1.5)
 
     ts_start = time.time()
-    ros.on('closing', handle_closing)
+    ros.on("closing", handle_closing)
     ros.close()
     ts_end = time.time()
     closing_was_handled_synchronously_before_close = ts_end - ts_start >= 1.5
 
-    assert ctx['closing_event_called']
-    assert ctx['was_still_connected']
+    assert ctx["closing_event_called"]
+    assert ctx["was_still_connected"]
     assert closing_was_handled_synchronously_before_close

tests/test_rosapi.py

@@ -4,9 +4,9 @@
 
 from roslibpy import Ros
 
-host = '127.0.0.1'
+host = "127.0.0.1"
 port = 9090
-url = u'ws://%s:%d' % (host, port)
+url = "ws://%s:%d" % (host, port)
 
 
 def test_rosapi_topics():
@@ -15,14 +15,14 @@ def test_rosapi_topics():
     ros.run()
 
     def callback(topic_list):
-        context['result'] = topic_list
-        context['wait'].set()
+        context["result"] = topic_list
+        context["wait"].set()
 
     ros.get_topics(callback)
-    if not context['wait'].wait(5):
+    if not context["wait"].wait(5):
         raise Exception
 
-    assert('/rosout' in context['result']['topics'])
+    assert "/rosout" in context["result"]["topics"]
     ros.close()
 
 
@@ -32,7 +32,7 @@ def test_rosapi_topics_blocking():
     topic_list = ros.get_topics()
 
     print(topic_list)
-    assert('/rosout' in topic_list)
+    assert "/rosout" in topic_list
 
     ros.close()
 
@@ -44,4 +44,4 @@ def test_connection_fails_when_missing_port():
 
 def test_connection_fails_when_schema_not_ws():
     with pytest.raises(Exception):
-        Ros(u'http://%s:%d' % (host, port))
+        Ros("http://%s:%d" % (host, port))

tests/test_service.py

@@ -2,44 +2,42 @@
 
 import time
 
-from roslibpy import Ros
-from roslibpy import Service
-from roslibpy import ServiceRequest
+from roslibpy import Ros, Service, ServiceRequest
 
 
 def test_add_two_ints_service():
-    ros = Ros('127.0.0.1', 9090)
+    ros = Ros("127.0.0.1", 9090)
     ros.run()
 
     def add_two_ints(request, response):
-        response['sum'] = request['a'] + request['b']
+        response["sum"] = request["a"] + request["b"]
 
         return False
 
-    service_name = '/test_sum_service'
-    service_type = 'rospy_tutorials/AddTwoInts'
+    service_name = "/test_sum_service"
+    service_type = "rospy_tutorials/AddTwoInts"
     service = Service(ros, service_name, service_type)
     service.advertise(add_two_ints)
     time.sleep(1)
 
     client = Service(ros, service_name, service_type)
-    result = client.call(ServiceRequest({'a': 2, 'b': 40}))
-    assert(result['sum'] == 42)
+    result = client.call(ServiceRequest({"a": 2, "b": 40}))
+    assert result["sum"] == 42
 
     service.unadvertise()
     time.sleep(2)
     ros.close()
 
 
 def test_empty_service():
-    ros = Ros('127.0.0.1', 9090)
+    ros = Ros("127.0.0.1", 9090)
     ros.run()
 
-    service = Service(ros, '/test_empty_service', 'std_srvs/Empty')
+    service = Service(ros, "/test_empty_service", "std_srvs/Empty")
     service.advertise(lambda req, resp: True)
     time.sleep(1)
 
-    client = Service(ros, '/test_empty_service', 'std_srvs/Empty')
+    client = Service(ros, "/test_empty_service", "std_srvs/Empty")
     client.call(ServiceRequest())
 
     service.unadvertise()

tests/test_tf.py

@@ -6,21 +6,21 @@
 
 def test_tf_test():
     context = dict(wait=threading.Event(), counter=0)
-    ros = Ros('127.0.0.1', 9090)
+    ros = Ros("127.0.0.1", 9090)
     ros.run()
 
-    tf_client = TFClient(ros, fixed_frame='world')
+    tf_client = TFClient(ros, fixed_frame="world")
 
     def callback(message):
-        context['message'] = message
-        context['counter'] += 1
-        context['wait'].set()
+        context["message"] = message
+        context["counter"] += 1
+        context["wait"].set()
 
-    tf_client.subscribe(frame_id='/world', callback=callback)
-    if not context['wait'].wait(5):
+    tf_client.subscribe(frame_id="/world", callback=callback)
+    if not context["wait"].wait(5):
         raise Exception
 
-    assert context['counter'] > 0
-    assert context['message']['translation'] == dict(x=0.0, y=0.0, z=0.0), 'Unexpected translation received'
-    assert context['message']['rotation'] == dict(x=0.0, y=0.0, z=0.0, w=1.0), 'Unexpected rotation received'
+    assert context["counter"] > 0
+    assert context["message"]["translation"] == dict(x=0.0, y=0.0, z=0.0), "Unexpected translation received"
+    assert context["message"]["rotation"] == dict(x=0.0, y=0.0, z=0.0, w=1.0), "Unexpected rotation received"
     ros.close()