diff options
| author | Victor Shyba <victor.shyba@gmail.com> | 2015-05-22 19:01:03 -0300 |
|---|---|---|
| committer | Victor Shyba <victor.shyba@gmail.com> | 2015-05-26 15:27:33 -0300 |
| commit | e4963b12cd700e67c74b9a519a1f659990f2a689 (patch) | |
| tree | a3ce8e4213dc080ba2b2a3d1f157ac4532aad6d5 /common | |
| parent | c32a444be61b18269dcdba556a641546df1d9f78 (diff) | |
[bug] fixes changes made by PR #211 due to bug 6833
CouchServerState does not use two extra parameters anymore. Tests are
now reflecting this change. Relate to #6833
Diffstat (limited to 'common')
6 files changed, 7 insertions, 14 deletions
diff --git a/common/src/leap/soledad/common/tests/test_couch_operations_atomicity.py b/common/src/leap/soledad/common/tests/test_couch_operations_atomicity.py index 83cee469..3de4da1c 100644 --- a/common/src/leap/soledad/common/tests/test_couch_operations_atomicity.py +++ b/common/src/leap/soledad/common/tests/test_couch_operations_atomicity.py @@ -81,8 +81,7 @@ class CouchAtomicityTestCase(CouchDBTestCase, TestCaseWithServer): shared_db=self.get_default_shared_mock(_put_doc_side_effect)) def make_app(self): - self.request_state = CouchServerState(self._couch_url, 'shared', - 'tokens') + self.request_state = CouchServerState(self._couch_url) return self.make_app_after_state(self.request_state) def setUp(self): diff --git a/common/src/leap/soledad/common/tests/test_server.py b/common/src/leap/soledad/common/tests/test_server.py index 836bd74a..2b653a1c 100644 --- a/common/src/leap/soledad/common/tests/test_server.py +++ b/common/src/leap/soledad/common/tests/test_server.py @@ -319,8 +319,7 @@ class EncryptedSyncTestCase( shared_db=self.get_default_shared_mock(_put_doc_side_effect)) def make_app(self): - self.request_state = CouchServerState(self._couch_url, 'shared', - 'tokens') + self.request_state = CouchServerState(self._couch_url) return self.make_app_with_state(self.request_state) def setUp(self): @@ -493,8 +492,7 @@ class LockResourceTestCase( urljoin(self._couch_url, 'tokens'), create=True, ensure_ddocs=True) - self._state = CouchServerState( - self._couch_url, 'shared', 'tokens') + self._state = CouchServerState(self._couch_url) def tearDown(self): # delete remote database diff --git a/common/src/leap/soledad/common/tests/test_sync.py b/common/src/leap/soledad/common/tests/test_sync.py index 893df56b..92c601dc 100644 --- a/common/src/leap/soledad/common/tests/test_sync.py +++ b/common/src/leap/soledad/common/tests/test_sync.py @@ -58,8 +58,7 @@ class InterruptableSyncTestCase( sync_target = token_soledad_sync_target def make_app(self): - self.request_state = couch.CouchServerState( - self._couch_url, 'shared', 'tokens') + self.request_state = couch.CouchServerState(self._couch_url) return self.make_app_with_state(self.request_state) def setUp(self): diff --git a/common/src/leap/soledad/common/tests/test_sync_deferred.py b/common/src/leap/soledad/common/tests/test_sync_deferred.py index 26889aff..010f5492 100644 --- a/common/src/leap/soledad/common/tests/test_sync_deferred.py +++ b/common/src/leap/soledad/common/tests/test_sync_deferred.py @@ -127,8 +127,7 @@ class TestSoledadDbSyncDeferredEncDecr( token = True def make_app(self): - self.request_state = couch.CouchServerState( - self._couch_url, 'shared', 'tokens') + self.request_state = couch.CouchServerState(self._couch_url) return self.make_app_with_state(self.request_state) def setUp(self): diff --git a/common/src/leap/soledad/common/tests/test_sync_target.py b/common/src/leap/soledad/common/tests/test_sync_target.py index 3792159a..941dc37c 100644 --- a/common/src/leap/soledad/common/tests/test_sync_target.py +++ b/common/src/leap/soledad/common/tests/test_sync_target.py @@ -470,8 +470,7 @@ class TestSoledadDbSync( def make_app(self): - self.request_state = couch.CouchServerState( - self._couch_url, 'shared', 'tokens') + self.request_state = couch.CouchServerState(self._couch_url) return self.make_app_with_state(self.request_state) def setUp(self): diff --git a/common/src/leap/soledad/common/tests/util.py b/common/src/leap/soledad/common/tests/util.py index 833d954e..75379fdc 100644 --- a/common/src/leap/soledad/common/tests/util.py +++ b/common/src/leap/soledad/common/tests/util.py @@ -459,6 +459,5 @@ class SoledadWithCouchServerMixin( def make_app(self): couch_url = urljoin( 'http://localhost:' + str(self.wrapper.port), 'tests') - self.request_state = CouchServerStateForTests( - couch_url, 'shared', 'tokens') + self.request_state = CouchServerStateForTests(couch_url) return self.make_app_with_state(self.request_state) |