summaryrefslogtreecommitdiff
path: root/src/leap/soledad/tests/test_sqlcipher.py
diff options
context:
space:
mode:
authordrebs <drebs@leap.se>2013-04-09 10:09:38 -0300
committerdrebs <drebs@leap.se>2013-04-09 10:09:38 -0300
commita8adbad77d34c66eda2a79e19b9afbc0f3d471a6 (patch)
tree5082c213fb1bea9c12746c294f019623af6353d9 /src/leap/soledad/tests/test_sqlcipher.py
parente6ca75a9e2a7a634f92ae54238df7d86100fbdab (diff)
Eliminate the use of super() in main code.
Tests inherited from u1db still use super, but that can be changed in the future.
Diffstat (limited to 'src/leap/soledad/tests/test_sqlcipher.py')
-rw-r--r--src/leap/soledad/tests/test_sqlcipher.py11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/leap/soledad/tests/test_sqlcipher.py b/src/leap/soledad/tests/test_sqlcipher.py
index 23847556..b71478ac 100644
--- a/src/leap/soledad/tests/test_sqlcipher.py
+++ b/src/leap/soledad/tests/test_sqlcipher.py
@@ -139,11 +139,11 @@ class TestSQLCipherDatabase(test_sqlite_backend.TestSQLiteDatabase):
def __init__(self, dbname, ntry):
self._try = ntry
self._is_initialized_invocations = 0
- super(SQLCipherDatabaseTesting, self).__init__(dbname,
- PASSWORD)
+ SQLCipherDatabase.__init__(self, dbname, PASSWORD)
def _is_initialized(self, c):
- res = super(SQLCipherDatabaseTesting, self)._is_initialized(c)
+ res = \
+ SQLCipherDatabase._is_initialized(self, c)
if self._try == 1:
self._is_initialized_invocations += 1
if self._is_initialized_invocations == 2:
@@ -183,8 +183,7 @@ class TestSQLCipherPartialExpandDatabase(
# our backend be instantiated in place.
def setUp(self):
- super(test_sqlite_backend.TestSQLitePartialExpandDatabase,
- self).setUp()
+ test_sqlite_backend.TestSQLitePartialExpandDatabase.setUp(self)
self.db = SQLCipherDatabase(':memory:', PASSWORD)
self.db._set_replica_uid('test')
@@ -264,7 +263,7 @@ class TestSQLCipherPartialExpandDatabase(
@classmethod
def _which_index_storage(cls, c):
- res = super(SQLiteDatabaseTesting, cls)._which_index_storage(c)
+ res = SQLCipherDatabase._which_index_storage(c)
db._ensure_schema() # init db
observed.append(res[0])
return res