Minor PEP8 fixes

Author: vshlapakov

tests/hubstorage/test_collections.py

@@ -13,7 +13,8 @@
 
 
 def _mkitem():
-    return dict(field1='value1', field2=['value2a', 'value2b'], field3=3, field4={'v4k': 'v4v'})
+    return dict(field1='value1', field2=['value2a', 'value2b'],
+                field3=3, field4={'v4k': 'v4v'})
 
 
 def test_simple_count(hsproject):
@@ -73,7 +74,8 @@ def post_scan_test(hsproject):
     assert len(result) == 11
 
     # combining with normal filters
-    result = list(col.get(filter='["counter", ">", [5]]', prefix='post_scan_test1'))
+    result = list(col.get(filter='["counter", ">", [5]]',
+                          prefix='post_scan_test1'))
     # 10-19
     assert len(result) == 10
 

tests/hubstorage/test_frontier.py

@@ -31,10 +31,12 @@ def test_add_multiple_chunks(hsproject):
     fps1 = [{'fp': '/index_%s.html' % fp} for fp in range(0, batch_size)]
     frontier.add(TEST_FRONTIER_NAME, TEST_FRONTIER_SLOT, fps1)
 
-    fps2 = [{'fp': '/index_%s.html' % fp} for fp in range(batch_size, batch_size * 2)]
+    fps2 = [{'fp': '/index_%s.html' % fp}
+            for fp in range(batch_size, batch_size * 2)]
     frontier.add(TEST_FRONTIER_NAME, TEST_FRONTIER_SLOT, fps2)
 
-    fps3 = [{'fp': '/index_%s.html' % fp} for fp in range(batch_size * 2, batch_size * 3)]
+    fps3 = [{'fp': '/index_%s.html' % fp}
+            for fp in range(batch_size * 2, batch_size * 3)]
     frontier.add(TEST_FRONTIER_NAME, TEST_FRONTIER_SLOT, fps3)
     frontier.flush()
 
@@ -49,7 +51,8 @@ def test_add_multiple_chunks(hsproject):
     assert frontier.newcount == 150 + old_count
 
     # get first 100
-    batches = list(frontier.read(TEST_FRONTIER_NAME, TEST_FRONTIER_SLOT, mincount=100))
+    batches = list(frontier.read(TEST_FRONTIER_NAME, TEST_FRONTIER_SLOT,
+                                 mincount=100))
     urls = [_get_urls(batch) for batch in batches]
     expected_urls = [[fp['fp'] for fp in fps1 + fps2]]
     assert urls == expected_urls
@@ -74,7 +77,8 @@ def test_add_big_chunk(hsproject):
     frontier.flush()
 
     # get first 100
-    batches = list(frontier.read(TEST_FRONTIER_NAME, TEST_FRONTIER_SLOT, mincount=100))
+    batches = list(frontier.read(TEST_FRONTIER_NAME, TEST_FRONTIER_SLOT,
+                                 mincount=100))
     urls = [_get_urls(batch) for batch in batches]
     expected_urls = [[fp['fp'] for fp in fps1[:100]]]
     assert urls == expected_urls
@@ -84,7 +88,8 @@ def test_add_big_chunk(hsproject):
     frontier.delete(TEST_FRONTIER_NAME, TEST_FRONTIER_SLOT, ids)
 
     # get next 100
-    batches = list(frontier.read(TEST_FRONTIER_NAME, TEST_FRONTIER_SLOT, mincount=100))
+    batches = list(frontier.read(TEST_FRONTIER_NAME, TEST_FRONTIER_SLOT,
+                                 mincount=100))
     urls = [_get_urls(batch) for batch in batches]
     expected_urls = [[fp['fp'] for fp in fps1[100:200]]]
     assert urls == expected_urls
@@ -94,7 +99,8 @@ def test_add_big_chunk(hsproject):
     frontier.delete(TEST_FRONTIER_NAME, TEST_FRONTIER_SLOT, ids)
 
     # get next 100
-    batches = list(frontier.read(TEST_FRONTIER_NAME, TEST_FRONTIER_SLOT, mincount=100))
+    batches = list(frontier.read(TEST_FRONTIER_NAME, TEST_FRONTIER_SLOT,
+                                 mincount=100))
     urls = [_get_urls(batch) for batch in batches]
     expected_urls = [[fp['fp'] for fp in fps1[200:300]]]
     assert urls == expected_urls

tests/hubstorage/test_jobq.py

@@ -81,6 +81,7 @@ def test_push_with_unique(hsproject):
         jobq.push(TEST_SPIDER_NAME, unique='h2')
     jobq.push(TEST_SPIDER_NAME, unique='h1')
 
+
 def test_startjob(hsproject):
     jobq = hsproject.jobq
     qj = jobq.push(TEST_SPIDER_NAME)

tests/hubstorage/test_project.py

@@ -115,7 +115,8 @@ def test_auth(hsclient):
         raise AssertionError('401 not raised')
 
     try:
-        hsc.get_project(TEST_PROJECT_ID).get_job((TEST_PROJECT_ID, 1, 1)).items.list()
+        hsc.get_project(TEST_PROJECT_ID).get_job(
+            (TEST_PROJECT_ID, 1, 1)).items.list()
     except HTTPError as exc:
         assert exc.response.status_code == 401
     else:
@@ -179,13 +180,13 @@ def test_requests(hsproject):
     job = hsproject.push_job(TEST_SPIDER_NAME, state='running')
     # top parent
     r1 = job.requests.add(url='http://test.com/', status=200, method='GET',
-                            rs=1337, duration=5, parent=None, ts=ts)
+                          rs=1337, duration=5, parent=None, ts=ts)
     # first child
     r2 = job.requests.add(url='http://test.com/2', status=400, method='POST',
-                            rs=0, duration=1, parent=r1, ts=ts + 1)
+                          rs=0, duration=1, parent=r1, ts=ts + 1)
     # another child with fingerprint set
     r3 = job.requests.add(url='http://test.com/3', status=400, method='PUT',
-                            rs=0, duration=1, parent=r1, ts=ts + 2, fp='1234')
+                          rs=0, duration=1, parent=r1, ts=ts + 2, fp='1234')
 
     job.requests.close()
     rr = job.requests.list()
@@ -243,7 +244,7 @@ def test_samples(hsproject):
 def test_jobsummary(hsproject):
     js = hsproject.jobsummary()
     assert js.get('project') == int(hsproject.projectid), js
-    assert js.get('has_capacity') == True, js
+    assert js.get('has_capacity') is True, js
     assert 'pending' in js, js
     assert 'running' in js, js
 
@@ -253,8 +254,7 @@ def test_bulkdata(hsproject):
     for i in range(20):
         j.logs.info("log line %d" % i)
         j.items.write(dict(field1="item%d" % i))
-        j.requests.add("http://test.com/%d" % i,
-            200, 'GET', 10, None, 10, 120)
+        j.requests.add("http://test.com/%d" % i, 200, 'GET', 10, None, 10, 120)
     for resourcename in ('logs', 'items', 'requests'):
         resource = getattr(j, resourcename)
         resource.flush()

tests/hubstorage/test_retry.py

@@ -153,6 +153,7 @@ def request_callback(request):
     assert dict(job_metadata) == dict(job.metadata)
     assert attempts_count[0] == 4
 
+
 @responses.activate
 def test_api_delete_can_be_set_to_non_idempotent(hsspiderid):
     # Prepare
@@ -181,6 +182,7 @@ def test_api_delete_can_be_set_to_non_idempotent(hsspiderid):
     assert attempts_count_delete[0] == 1
     assert err is not None
 
+
 @responses.activate
 def test_collection_store_and_delete_are_retried():
     # Prepare
@@ -202,6 +204,7 @@ def test_collection_store_and_delete_are_retried():
     assert attempts_count_post[0] == 3
     assert attempts_count_delete[0] == 3
 
+
 @responses.activate
 def test_delete_requests_are_retried(hsspiderid):
     # Prepare
@@ -229,6 +232,7 @@ def test_delete_requests_are_retried(hsspiderid):
     # Assert
     assert attempts_count_delete[0] == 3
 
+
 @responses.activate
 def test_metadata_save_does_retry(hsspiderid):
     # Prepare
@@ -252,6 +256,7 @@ def test_metadata_save_does_retry(hsspiderid):
     # Assert
     assert attempts_count_post[0] == 3
 
+
 @responses.activate
 def test_push_job_does_not_retry():
     # Prepare
@@ -273,6 +278,7 @@ def test_push_job_does_not_retry():
     assert err.response.status_code == 504
     assert attempts_count[0] == 1
 
+
 @responses.activate
 def test_get_job_does_retry(hsspiderid):
     # Prepare
@@ -321,6 +327,7 @@ def test_get_job_does_fails_if_no_retries(hsspiderid):
     assert err.response.status_code == 504
     assert attempts_count[0] == 1
 
+
 @responses.activate
 def test_get_job_does_fails_on_too_many_retries(hsspiderid):
     # Prepare

tests/hubstorage/test_system.py

@@ -75,6 +75,7 @@ def _do_test_job(hsproject, panelproject,
     assert job.metadata.get('close_reason') == expected_close_reason
     return job
 
+
 def _run_runner(hsproject, pushed, close_reason):
     client = HubstorageClient(endpoint=TEST_ENDPOINT, auth=TEST_AUTH)
     with closing(client) as runnerclient: