From e5e5a6a8e6ca209b0abf3a95521c9e6d5b329565 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Mon, 17 Aug 2015 19:33:55 -0400 Subject: [style] pep8 cleanup --- common/src/leap/soledad/common/tests/test_server.py | 4 +++- common/src/leap/soledad/common/tests/test_sqlcipher_sync.py | 1 - common/src/leap/soledad/common/tests/test_sync_mutex.py | 3 +-- common/src/leap/soledad/common/tests/util.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'common/src/leap') diff --git a/common/src/leap/soledad/common/tests/test_server.py b/common/src/leap/soledad/common/tests/test_server.py index bf08f4d6..5ffa2a63 100644 --- a/common/src/leap/soledad/common/tests/test_server.py +++ b/common/src/leap/soledad/common/tests/test_server.py @@ -461,7 +461,9 @@ class EncryptedSyncTestCase( """ Test if Soledad can sync very large files. """ - self.skipTest("Work in progress. For reference, see: https://leap.se/code/issues/7370 ") + self.skipTest( + "Work in progress. For reference, see: " + "https://leap.se/code/issues/7370") length = 100 * (10 ** 6) # 100 MB return self._test_encrypted_sym_sync(doc_size=length, number_of_docs=1) diff --git a/common/src/leap/soledad/common/tests/test_sqlcipher_sync.py b/common/src/leap/soledad/common/tests/test_sqlcipher_sync.py index 49bf3bd6..dd66a58a 100644 --- a/common/src/leap/soledad/common/tests/test_sqlcipher_sync.py +++ b/common/src/leap/soledad/common/tests/test_sqlcipher_sync.py @@ -349,7 +349,6 @@ def _make_local_db_and_token_http_target(test, path='test'): create=True, ensure_ddocs=True) - #db = test.request_state.open_database(os.path.basename(path)) replica_uid = test._soledad._dbpool.replica_uid sync_db = test._soledad._sync_db sync_enc_pool = test._soledad._sync_enc_pool diff --git a/common/src/leap/soledad/common/tests/test_sync_mutex.py b/common/src/leap/soledad/common/tests/test_sync_mutex.py index 89ccd75e..207338e4 100644 --- a/common/src/leap/soledad/common/tests/test_sync_mutex.py +++ b/common/src/leap/soledad/common/tests/test_sync_mutex.py @@ -47,6 +47,7 @@ from leap.soledad.common.tests.util import soledad_sync_target _old_sync = SoledadSynchronizer.sync + def _timed_sync(self, defer_decryption=True): t = time.time() @@ -55,7 +56,6 @@ def _timed_sync(self, defer_decryption=True): if not getattr(self.source, 'sync_times', False): self.source.sync_times = {} - self.source.sync_times[sync_id] = {'start': t} def _store_finish_time(passthrough): @@ -98,7 +98,6 @@ class TestSyncMutex( TestCaseWithServer.tearDown(self) shutil.rmtree(self.tempdir) - def test_two_concurrent_syncs_do_not_overlap_no_docs(self): self.startServer() diff --git a/common/src/leap/soledad/common/tests/util.py b/common/src/leap/soledad/common/tests/util.py index 910a8d54..fe43986c 100644 --- a/common/src/leap/soledad/common/tests/util.py +++ b/common/src/leap/soledad/common/tests/util.py @@ -187,7 +187,7 @@ def soledad_sync_target( source_replica_uid, creds, test._soledad._crypto, - None, # cert_file + None, # cert_file sync_db=sync_db, sync_enc_pool=sync_enc_pool) -- cgit v1.2.3