summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2016-06-22 23:09:02 +0200
committerKali Kaneko <kali@leap.se>2016-06-22 23:09:02 +0200
commit9b3737a66b4df0a6e0fd4d91da097f36e94bd8e2 (patch)
tree1de493e82a148f9cf8d1de9212bd2d37c731d263 /common
parenta973e1ffcb4bce613693a0a3bdcade615cf0b1cb (diff)
pep8
Diffstat (limited to 'common')
-rw-r--r--common/src/leap/soledad/common/couch/__init__.py3
-rw-r--r--common/src/leap/soledad/common/tests/test_encdecpool.py5
2 files changed, 5 insertions, 3 deletions
diff --git a/common/src/leap/soledad/common/couch/__init__.py b/common/src/leap/soledad/common/couch/__init__.py
index 5bda8071..8c60b6a4 100644
--- a/common/src/leap/soledad/common/couch/__init__.py
+++ b/common/src/leap/soledad/common/couch/__init__.py
@@ -341,7 +341,8 @@ class CouchDatabase(object):
# This will not be needed when/if we switch from python-couchdb to
# paisley.
time.strptime('Mar 8 1917', '%b %d %Y')
- get_one = functools.partial(self.get_doc, check_for_conflicts=check_for_conflicts)
+ get_one = functools.partial(
+ self.get_doc, check_for_conflicts=check_for_conflicts)
docs = [THREAD_POOL.apply_async(get_one, [doc_id])
for doc_id in doc_ids]
for doc in docs:
diff --git a/common/src/leap/soledad/common/tests/test_encdecpool.py b/common/src/leap/soledad/common/tests/test_encdecpool.py
index e6ad66ca..c626561d 100644
--- a/common/src/leap/soledad/common/tests/test_encdecpool.py
+++ b/common/src/leap/soledad/common/tests/test_encdecpool.py
@@ -133,7 +133,7 @@ class TestSyncDecrypterPool(BaseSoledadTest):
self.assertFalse(self._pool.running)
self.assertTrue(self._pool.deferred.called)
- def test_sync_id_column_is_created_if_non_existing_in_docs_received_table(self):
+ def test_sync_id_col_is_created_if_non_existing_in_docs_recvd_table(self):
"""
Test that docs_received table is migrated, and has the sync_id column
"""
@@ -145,7 +145,8 @@ class TestSyncDecrypterPool(BaseSoledadTest):
pool.stop()
def assert_trial_to_create_sync_id_column(_):
- mock_run_query.assert_called_once_with("ALTER TABLE docs_received ADD COLUMN sync_id")
+ mock_run_query.assert_called_once_with(
+ "ALTER TABLE docs_received ADD COLUMN sync_id")
d.addCallback(assert_trial_to_create_sync_id_column)
return d