Fix contract test issues

Author: keelerm84

contract-tests/service.py

@@ -4,7 +4,6 @@
 import sys
 from logging.config import dictConfig
 
-import urllib3
 from flask import Flask, request
 from flask.logging import default_handler
 from stream_entity import StreamEntity
@@ -30,7 +29,7 @@
         'handlers': ['console']
     },
     'loggers': {
-        'werkzeug': { 'level': 'ERROR' } # disable irrelevant Flask app logging
+        'werkzeug': {'level': 'ERROR'}  # disable irrelevant Flask app logging
     }
 })
 

contract-tests/stream_entity.py

@@ -9,9 +9,9 @@
 
 # Import ld_eventsource from parent directory
 sys.path.insert(1, os.path.join(sys.path[0], '..'))
-from ld_eventsource import *
-from ld_eventsource.actions import *
-from ld_eventsource.config import *
+from ld_eventsource import *  # noqa: E402
+from ld_eventsource.actions import *  # noqa: E402
+from ld_eventsource.config import *  # noqa: E402
 
 http_client = urllib3.PoolManager()
 
@@ -39,54 +39,59 @@ def run(self):
             connect = ConnectStrategy.http(
                 url=stream_url,
                 headers=self.options.get("headers"),
-                urllib3_request_options=None if self.options.get("readTimeoutMs") is None else {
-                    "timeout": urllib3.Timeout(read=millis_to_seconds(self.options.get("readTimeoutMs")))
-                }
-            )                    
+                urllib3_request_options=(
+                    None
+                    if self.options.get("readTimeoutMs") is None
+                    else {
+                        "timeout": urllib3.Timeout(
+                            read=millis_to_seconds(self.options.get("readTimeoutMs"))
+                        )
+                    }
+                ),
+            )
             sse = SSEClient(
                 connect,
-                initial_retry_delay=millis_to_seconds(self.options.get("initialDelayMs")),
+                initial_retry_delay=millis_to_seconds(
+                    self.options.get("initialDelayMs")
+                ),
                 last_event_id=self.options.get("lastEventId"),
-                error_strategy=ErrorStrategy.from_lambda(lambda _:
-                    (ErrorStrategy.FAIL if self.closed else ErrorStrategy.CONTINUE, None)),
-                logger=self.log
+                error_strategy=ErrorStrategy.from_lambda(
+                    lambda _: (
+                        ErrorStrategy.FAIL if self.closed else ErrorStrategy.CONTINUE,
+                        None,
+                    )
+                ),
+                logger=self.log,
             )
             self.sse = sse
             for item in sse.all:
                 if isinstance(item, Event):
                     self.log.info('Received event from stream (%s)', item.event)
-                    self.send_message({
-                        'kind': 'event',
-                        'event': {
-                            'type': item.event,
-                            'data': item.data,
-                            'id': item.last_event_id
+                    self.send_message(
+                        {
+                            'kind': 'event',
+                            'event': {
+                                'type': item.event,
+                                'data': item.data,
+                                'id': item.last_event_id,
+                            },
                         }
-                    })
+                    )
                 elif isinstance(item, Comment):
                     self.log.info('Received comment from stream: %s', item.comment)
-                    self.send_message({
-                        'kind': 'comment',
-                        'comment': item.comment
-                    })
+                    self.send_message({'kind': 'comment', 'comment': item.comment})
                 elif isinstance(item, Fault):
                     if self.closed:
                         break
                     # item.error will be None if this is just an EOF rather than an I/O error or HTTP error.
                     # Currently the test harness does not expect us to send an error message in that case.
                     if item.error:
                         self.log.info('Received error from stream: %s' % item.error)
-                        self.send_message({
-                            'kind': 'error',
-                            'error': str(item.error)
-                        })
+                        self.send_message({'kind': 'error', 'error': str(item.error)})
         except Exception as e:
             self.log.info('Received error from stream: %s', e)
             self.log.info(traceback.format_exc())
-            self.send_message({
-                'kind': 'error',
-                'error': str(e)
-            })
+            self.send_message({'kind': 'error', 'error': str(e)})
 
     def do_command(self, command: str) -> bool:
         self.log.info('Test service sent command: %s' % command)
@@ -105,9 +110,9 @@ def send_message(self, message):
             resp = http_client.request(
                 'POST',
                 callback_url,
-                headers = {'Content-Type': 'application/json'},
-                body = json.dumps(message)
-                )
+                headers={'Content-Type': 'application/json'},
+                body=json.dumps(message),
+            )
             if resp.status >= 300 and not self.closed:
                 self.log.error('Callback request returned HTTP error %d', resp.status)
         except Exception as e:

setup.cfg

@@ -0,0 +1,2 @@
+[pycodestyle]
+ignore = E501