From b9f7bcab4e8f85b4e58b457969b81cc78e0c35cc Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Tue, 27 Oct 2020 09:49:58 -0400 Subject: [PATCH] flakes --- integration/conftest.py | 2 -- integration/test_servers_of_happiness.py | 1 - integration/test_tor.py | 11 ++--------- integration/test_web.py | 8 ++------ 4 files changed, 4 insertions(+), 18 deletions(-) diff --git a/integration/conftest.py b/integration/conftest.py index 802deb79d..ca18230cd 100644 --- a/integration/conftest.py +++ b/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, diff --git a/integration/test_servers_of_happiness.py b/integration/test_servers_of_happiness.py index e5e4eb565..97392bf00 100644 --- a/integration/test_servers_of_happiness.py +++ b/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 diff --git a/integration/test_tor.py b/integration/test_tor.py index 28360207a..3d169a88f 100644 --- a/integration/test_tor.py +++ b/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 diff --git a/integration/test_web.py b/integration/test_web.py index 575e4fc1a..fe2137ff3 100644 --- a/integration/test_web.py +++ b/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)