summaryrefslogtreecommitdiff
path: root/testing/tests/sync/test_sync_deferred.py
diff options
context:
space:
mode:
authorVictor Shyba <victor.shyba@gmail.com>2016-09-18 00:26:45 -0300
committerdrebs <drebs@leap.se>2016-12-12 09:11:58 -0200
commit35563cb74fcfd7f6ae969ed3af3a74d3c18cbf5b (patch)
tree6267a89f3f51c5d245edf3ecdbcdd6b0af42f54b /testing/tests/sync/test_sync_deferred.py
parentb774387754ecae77d3ae00de2a9e072cef2eb2e7 (diff)
[refactor] remove decpool
It's not being used
Diffstat (limited to 'testing/tests/sync/test_sync_deferred.py')
-rw-r--r--testing/tests/sync/test_sync_deferred.py15
1 files changed, 4 insertions, 11 deletions
diff --git a/testing/tests/sync/test_sync_deferred.py b/testing/tests/sync/test_sync_deferred.py
index 4948aaf8..482b150c 100644
--- a/testing/tests/sync/test_sync_deferred.py
+++ b/testing/tests/sync/test_sync_deferred.py
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
"""
-Test Leap backend bits: sync with deferred encryption/decryption.
+Test Leap backend bits: sync with deferred encryption.
"""
import time
import os
@@ -22,12 +22,8 @@ import random
import string
import shutil
-from urlparse import urljoin
-
from twisted.internet import defer
-from leap.soledad.common import couch
-
from leap.soledad.client import sync
from leap.soledad.client.sqlcipher import SQLCipherOptions
from leap.soledad.client.sqlcipher import SQLCipherDatabase
@@ -41,9 +37,6 @@ from test_soledad.util import make_soledad_app
from test_soledad.util import soledad_sync_target
-# Just to make clear how this test is different... :)
-DEFER_DECRYPTION = True
-
WAIT_STEP = 1
MAX_WAIT = 10
DBPASS = "pass"
@@ -52,7 +45,7 @@ DBPASS = "pass"
class BaseSoledadDeferredEncTest(SoledadWithCouchServerMixin):
"""
- Another base class for testing the deferred encryption/decryption during
+ Another base class for testing the deferred encryption during
the syncs, using the intermediate database.
"""
defer_sync_encryption = True
@@ -109,7 +102,7 @@ class TestSoledadDbSyncDeferredEncDecr(
"""
Test db.sync remote sync shortcut.
- Case with deferred encryption and decryption: using the intermediate
+ Case with deferred encryption: using the intermediate
syncdb.
"""
@@ -158,7 +151,7 @@ class TestSoledadDbSyncDeferredEncDecr(
self.addCleanup(target.close)
return sync.SoledadSynchronizer(
dbsyncer,
- target).sync(defer_decryption=True)
+ target).sync()
def wait_for_sync(self):
"""