Reform compliance/ with Black and isort

For consistency with the rest of the project.

Author: bluetech

compliance/run-autobahn-tests.py

@@ -3,74 +3,80 @@
 
 from __future__ import print_function
 
-import sys
-import os.path
 import argparse
+import copy
 import errno
-import subprocess
 import json
+import os.path
 import socket
+import subprocess
+import sys
 import time
-import copy
 
 PORT = 8642
 
 CLIENT_CONFIG = {
-   "options": {"failByDrop": False},
-   "outdir": "./reports/servers",
-
-   "servers": [
-       {
-           "agent": "wsproto",
-           "url": "ws://localhost:{}".format(PORT),
-           "options": {"version": 18},
-       },
-   ],
-
-   "cases": ["*"],
-   "exclude-cases": [],
-   "exclude-agent-cases": {},
+    "options": {"failByDrop": False},
+    "outdir": "./reports/servers",
+    "servers": [
+        {
+            "agent": "wsproto",
+            "url": "ws://localhost:{}".format(PORT),
+            "options": {"version": 18},
+        }
+    ],
+    "cases": ["*"],
+    "exclude-cases": [],
+    "exclude-agent-cases": {},
 }
 
 SERVER_CONFIG = {
-   "url": "ws://localhost:{}".format(PORT),
-
-   "options": {"failByDrop": False},
-   "outdir": "./reports/clients",
-   "webport": 8080,
-
-   "cases": ["*"],
-   "exclude-cases": [],
-   "exclude-agent-cases": {}
+    "url": "ws://localhost:{}".format(PORT),
+    "options": {"failByDrop": False},
+    "outdir": "./reports/clients",
+    "webport": 8080,
+    "cases": ["*"],
+    "exclude-cases": [],
+    "exclude-agent-cases": {},
 }
 
 CASES = {
     "all": ["*"],
-    "fast":
+    "fast": [
         # The core functionality tests
-        ["{}.*".format(i) for i in range(1, 12)]
+        *["{}.*".format(i) for i in range(1, 12)],
         # Compression tests -- in each section, the tests get progressively
         # slower until they're taking 10s of seconds apiece. And it's
         # mostly stress tests, without much extra coverage to show for
         # it. (Weird trick: autobahntestsuite treats these as regexps
         # except that . is quoted and * becomes .*)
-        + ["12.*.[1234]$", "13.*.[1234]$"]
+        "12.*.[1234]$",
+        "13.*.[1234]$",
         # At one point these were catching a unique bug that none of the
         # above were -- they're relatively quick and involve
         # fragmentation.
-        + ["12.1.11", "12.1.12", "13.1.11", "13.1.12"],
+        "12.1.11",
+        "12.1.12",
+        "13.1.11",
+        "13.1.12",
+    ],
 }
 
+
 def say(*args):
     print("run-autobahn-tests.py:", *args)
 
+
 def setup_venv():
     if not os.path.exists("autobahntestsuite-venv"):
         say("Creating Python 2.7 environment and installing autobahntestsuite")
         subprocess.check_call(
-            ["virtualenv", "-p", "python2.7", "autobahntestsuite-venv"])
+            ["virtualenv", "-p", "python2.7", "autobahntestsuite-venv"]
+        )
         subprocess.check_call(
-            ["autobahntestsuite-venv/bin/pip", "install", "autobahntestsuite>=0.8.0"])
+            ["autobahntestsuite-venv/bin/pip", "install", "autobahntestsuite>=0.8.0"]
+        )
+
 
 def wait_for_listener(port):
     while True:
@@ -87,13 +93,20 @@ def wait_for_listener(port):
         finally:
             sock.close()
 
+
 def coverage(command, coverage_settings):
     if not coverage_settings["enabled"]:
         return [sys.executable] + command
 
-    return ([sys.executable, "-m", "coverage", "run",
-             "--include", coverage_settings["wsproto-path"]]
-            + command)
+    return [
+        sys.executable,
+        "-m",
+        "coverage",
+        "run",
+        "--include",
+        coverage_settings["wsproto-path"],
+    ] + command
+
 
 def summarize(report_path):
     with open(os.path.join(report_path, "index.json")) as f:
@@ -103,31 +116,36 @@ def summarize(report_path):
     PASS = {"OK", "INFORMATIONAL"}
     for test_name, results in sorted(result_summary.items()):
         total += 1
-        if (results["behavior"] not in PASS
-              or results["behaviorClose"] not in PASS):
+        if results["behavior"] not in PASS or results["behaviorClose"] not in PASS:
             say("FAIL:", test_name, results)
             say("Details:")
             with open(os.path.join(report_path, results["reportfile"])) as f:
                 print(f.read())
             failed += 1
 
-    speed_ordered = sorted(result_summary.items(),
-                           key=lambda kv: -kv[1]["duration"])
+    speed_ordered = sorted(result_summary.items(), key=lambda kv: -kv[1]["duration"])
     say("Slowest tests:")
     for test_name, results in speed_ordered[:5]:
         say("    {}: {} seconds".format(test_name, results["duration"] / 1000))
 
     return failed, total
 
+
 def run_client_tests(cases, coverage_settings):
     say("Starting autobahntestsuite server")
     server_config = copy.deepcopy(SERVER_CONFIG)
     server_config["cases"] = cases
     with open("auto-tests-server-config.json", "w") as f:
         json.dump(server_config, f)
     server = subprocess.Popen(
-        ["autobahntestsuite-venv/bin/wstest", "-m", "fuzzingserver",
-         "-s", "auto-tests-server-config.json"])
+        [
+            "autobahntestsuite-venv/bin/wstest",
+            "-m",
+            "fuzzingserver",
+            "-s",
+            "auto-tests-server-config.json",
+        ]
+    )
     say("Waiting for server to start")
     wait_for_listener(PORT)
     try:
@@ -143,6 +161,7 @@ def run_client_tests(cases, coverage_settings):
 
     return summarize("reports/clients")
 
+
 def run_server_tests(cases, coverage_settings):
     say("Starting wsproto test server")
     server = subprocess.Popen(coverage(["./test_server.py"], coverage_settings))
@@ -156,8 +175,14 @@ def run_server_tests(cases, coverage_settings):
             json.dump(client_config, f)
         say("Starting autobahntestsuite client")
         subprocess.check_call(
-            ["autobahntestsuite-venv/bin/wstest", "-m", "fuzzingclient",
-             "-s", "auto-tests-client-config.json"])
+            [
+                "autobahntestsuite-venv/bin/wstest",
+                "-m",
+                "fuzzingclient",
+                "-s",
+                "auto-tests-client-config.json",
+            ]
+        )
     finally:
         say("Stopping server...")
         # Connection on this port triggers a shutdown
@@ -168,13 +193,12 @@ def run_server_tests(cases, coverage_settings):
 
     return summarize("reports/servers")
 
+
 def main():
     if not os.path.exists("test_client.py"):
         say("Run me from the compliance/ directory")
         sys.exit(2)
-    coverage_settings = {
-        "coveragerc": "../.coveragerc",
-    }
+    coverage_settings = {"coveragerc": "../.coveragerc"}
     try:
         import wsproto
     except ImportError:
@@ -188,16 +212,16 @@ def main():
     parser.add_argument("MODE", help="'client' or 'server'")
     # can do e.g.
     #   --cases='["1.*"]'
-    parser.add_argument("--cases",
-                        help="'fast' or 'all' or a JSON list",
-                        default="fast")
+    parser.add_argument(
+        "--cases", help="'fast' or 'all' or a JSON list", default="fast"
+    )
     parser.add_argument("--cov", help="enable coverage", action="store_true")
 
     args = parser.parse_args()
 
     coverage_settings["enabled"] = args.cov
     cases = args.cases
-    #pylint: disable=consider-using-get
+    # pylint: disable=consider-using-get
     if cases in CASES:
         cases = CASES[cases]
     else:
@@ -213,8 +237,9 @@ def main():
         say("Unrecognized mode, try 'client' or 'server'")
         sys.exit(2)
 
-    say("in {} mode: failed {} out of {} total"
-        .format(args.MODE.upper(), failed, total))
+    say(
+        "in {} mode: failed {} out of {} total".format(args.MODE.upper(), failed, total)
+    )
 
     if failed:
         say("Test failed")

compliance/test_client.py

@@ -4,17 +4,25 @@
 
 from wsproto import WSConnection
 from wsproto.connection import CLIENT
-from wsproto.events import AcceptConnection, CloseConnection, Ping, Request, TextMessage, Message
+from wsproto.events import (
+    AcceptConnection,
+    CloseConnection,
+    Message,
+    Ping,
+    Request,
+    TextMessage,
+)
 from wsproto.extensions import PerMessageDeflate
 from wsproto.frame_protocol import CloseReason
 
-SERVER = 'ws://127.0.0.1:8642'
-AGENT = 'wsproto'
+SERVER = "ws://127.0.0.1:8642"
+AGENT = "wsproto"
 
 CONNECTION_EXCEPTIONS = (ConnectionError, OSError)
 
+
 def get_case_count(server):
-    uri = urlparse(server + '/getCaseCount')
+    uri = urlparse(server + "/getCaseCount")
     connection = WSConnection(CLIENT)
     sock = socket.socket()
     sock.connect((uri.hostname, uri.port or 80))
@@ -32,7 +40,9 @@ def get_case_count(server):
                 data += event.data
                 if event.message_finished:
                     case_count = json.loads(data)
-                    out_data += connection.send(CloseConnection(code=CloseReason.NORMAL_CLOSURE))
+                    out_data += connection.send(
+                        CloseConnection(code=CloseReason.NORMAL_CLOSURE)
+                    )
             try:
                 sock.sendall(out_data)
             except CONNECTION_EXCEPTIONS:
@@ -41,17 +51,21 @@ def get_case_count(server):
     sock.close()
     return case_count
 
+
 def run_case(server, case, agent):
-    uri = urlparse(server + '/runCase?case=%d&agent=%s' % (case, agent))
+    uri = urlparse(server + "/runCase?case=%d&agent=%s" % (case, agent))
     connection = WSConnection(CLIENT)
     sock = socket.socket()
     sock.connect((uri.hostname, uri.port or 80))
 
     sock.sendall(
-        connection.send(Request(
-            host=uri.netloc, target='%s?%s' % (uri.path, uri.query),
-            extensions=[PerMessageDeflate()],
-        ))
+        connection.send(
+            Request(
+                host=uri.netloc,
+                target="%s?%s" % (uri.path, uri.query),
+                extensions=[PerMessageDeflate()],
+            )
+        )
     )
     closed = False
 
@@ -64,7 +78,9 @@ def run_case(server, case, agent):
         out_data = b""
         for event in connection.events():
             if isinstance(event, Message):
-                out_data += connection.send(Message(data=event.data, message_finished=event.message_finished))
+                out_data += connection.send(
+                    Message(data=event.data, message_finished=event.message_finished)
+                )
             elif isinstance(event, Ping):
                 out_data += connection.send(event.response())
             elif isinstance(event, CloseConnection):
@@ -80,14 +96,17 @@ def run_case(server, case, agent):
             closed = True
             break
 
+
 def update_reports(server, agent):
-    uri = urlparse(server + '/updateReports?agent=%s' % agent)
+    uri = urlparse(server + "/updateReports?agent=%s" % agent)
     connection = WSConnection(CLIENT)
     sock = socket.socket()
     sock.connect((uri.hostname, uri.port or 80))
 
     sock.sendall(
-        connection.send(Request(host=uri.netloc, target='%s?%s' % (uri.path, uri.query)))
+        connection.send(
+            Request(host=uri.netloc, target="%s?%s" % (uri.path, uri.query))
+        )
     )
     closed = False
 
@@ -96,14 +115,17 @@ def update_reports(server, agent):
         connection.receive_data(data)
         for event in connection.events():
             if isinstance(event, AcceptConnection):
-                sock.sendall(connection.send(CloseConnection(code=CloseReason.NORMAL_CLOSURE)))
+                sock.sendall(
+                    connection.send(CloseConnection(code=CloseReason.NORMAL_CLOSURE))
+                )
                 try:
                     sock.close()
                 except CONNECTION_EXCEPTIONS:
                     pass
                 finally:
                     closed = True
 
+
 CASE = None
 # 1.1.1 = 1
 # 2.1 = 17
@@ -114,6 +136,7 @@ def update_reports(server, agent):
 # 12.1.1 = 304
 # 13.1.1 = 394
 
+
 def run_tests(server, agent):
     case_count = get_case_count(server)
     if CASE is not None:
@@ -126,5 +149,6 @@ def run_tests(server, agent):
         print("\nRan %d cases." % case_count)
     update_reports(server, agent)
 
-if __name__ == '__main__':
+
+if __name__ == "__main__":
     run_tests(SERVER, AGENT)