Merge pull request #878 from tahoe-lafs/3490.integration-codechecks

Run static codechecks on the implementation of the integration test suite

Fixes: ticket:3490

integration/conftest.py

@@ -15,7 +15,6 @@ from foolscap.furl import (
 from eliot import (
     to_file,
     log_call,
-    start_action,
 )
 
 from twisted.python.procutils import which
@@ -34,7 +33,6 @@ from util import (
     _DumpOutputProtocol,
     _ProcessExitedProtocol,
     _create_node,
-    _run_node,
     _cleanup_tahoe_process,
     _tahoe_runner_optional_coverage,
     await_client_ready,

integration/test_servers_of_happiness.py

@@ -1,7 +1,6 @@
 import sys
 from os.path import join
 
-from twisted.internet import task
 from twisted.internet.error import ProcessTerminated
 
 import util

integration/test_tor.py

@@ -1,15 +1,8 @@
 from __future__ import print_function
 
 import sys
-import time
-import shutil
-from os import mkdir, unlink, listdir
-from os.path import join, exists
-from six.moves import StringIO
-
-from twisted.internet.protocol import ProcessProtocol
-from twisted.internet.error import ProcessExitedAlready, ProcessDone
-from twisted.internet.defer import inlineCallbacks, Deferred
+from os import mkdir
+from os.path import join
 
 import pytest
 import pytest_twisted

integration/test_web.py

@@ -9,20 +9,15 @@ WebAPI *should* do in every situation. It's not clear the latter
 exists anywhere, however.
 """
 
-import sys
 import time
-import shutil
 import json
 import urllib2
-from os import mkdir, unlink, utime
-from os.path import join, exists, getmtime
 
 import allmydata.uri
 
 import util
 
 import requests
-import pytest_twisted
 import html5lib
 from bs4 import BeautifulSoup
 
@@ -265,7 +260,8 @@ def test_directory_deep_check(alice):
         dircap_url,
         params={u"t": u"json"},
     )
-    dir_meta = json.loads(resp.content)
+    # Just verify it is valid JSON.
+    json.loads(resp.content)
 
     # upload a file of pangrams into the directory
     FILE_CONTENTS = u"Sphinx of black quartz, judge my vow.\n" * (2048*10)

tox.ini

@@ -96,7 +96,7 @@ setenv =
          # `TypeError: decode() argument 1 must be string, not None`
          PYTHONIOENCODING=utf_8
 commands =
-         flake8 src static misc setup.py
+         flake8 src integration static misc setup.py
          python misc/coding_tools/check-umids.py src
          python misc/coding_tools/check-debugging.py
          python misc/coding_tools/find-trailing-spaces.py -r src static misc setup.py