diff options
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | client/pkg/requirements-latest.pip | 8 | ||||
| -rw-r--r-- | client/src/leap/soledad/client/api.py | 3 | ||||
| -rw-r--r-- | common/pkg/requirements-latest.pip | 6 | ||||
| -rw-r--r-- | common/src/leap/soledad/common/tests/util.py | 4 | ||||
| -rw-r--r-- | server/pkg/requirements-latest.pip | 8 |
6 files changed, 29 insertions, 3 deletions
@@ -12,3 +12,6 @@ MANIFEST *.log *.*~ *.csv +.eggs +_trial_temp +.DS_Store diff --git a/client/pkg/requirements-latest.pip b/client/pkg/requirements-latest.pip new file mode 100644 index 00000000..a629aa57 --- /dev/null +++ b/client/pkg/requirements-latest.pip @@ -0,0 +1,8 @@ +--index-url https://pypi.python.org/simple/ + +--allow-external u1db --allow-unverified u1db +--allow-external dirspec --allow-unverified dirspec + +-e 'git+https://github.com/pixelated-project/leap_pycommon.git@develop#egg=leap.common' +-e '../common' +-e . diff --git a/client/src/leap/soledad/client/api.py b/client/src/leap/soledad/client/api.py index def2841a..a3dfb1d4 100644 --- a/client/src/leap/soledad/client/api.py +++ b/client/src/leap/soledad/client/api.py @@ -213,8 +213,7 @@ class Soledad(object): soledad_assert_type(self._passphrase, unicode) def initialize(attr, val): - return (getattr(self, attr, None) is None - and setattr(self, attr, val)) + return (getattr(self, attr, None) is None and setattr(self, attr, val)) initialize("_secrets_path", os.path.join( self.default_prefix, self.secrets_file_name)) diff --git a/common/pkg/requirements-latest.pip b/common/pkg/requirements-latest.pip new file mode 100644 index 00000000..9de17382 --- /dev/null +++ b/common/pkg/requirements-latest.pip @@ -0,0 +1,6 @@ +--index-url https://pypi.python.org/simple/ + +--allow-external u1db --allow-unverified u1db +--allow-external dirspec --allow-unverified dirspec +-e 'git+https://github.com/pixelated-project/leap_pycommon.git@develop#egg=leap.common' +-e . diff --git a/common/src/leap/soledad/common/tests/util.py b/common/src/leap/soledad/common/tests/util.py index d8d86850..cbd92b94 100644 --- a/common/src/leap/soledad/common/tests/util.py +++ b/common/src/leap/soledad/common/tests/util.py @@ -43,6 +43,7 @@ from u1db.remote import http_database from twisted.trial import unittest from leap.common.files import mkdir_p +from leap.common.testing.basetest import BaseLeapTest from leap.soledad.common import soledad_assert from leap.soledad.common.document import SoledadDocument @@ -184,7 +185,7 @@ def token_soledad_sync_target(test, path): return st -class BaseSoledadTest(unittest.TestCase, MockedSharedDBTest): +class BaseSoledadTest(BaseLeapTest, MockedSharedDBTest): """ Instantiates Soledad for usage in tests. """ @@ -194,6 +195,7 @@ class BaseSoledadTest(unittest.TestCase, MockedSharedDBTest): # The following snippet comes from BaseLeapTest.setUpClass, but we # repeat it here because twisted.trial does not work with # setUpClass/tearDownClass. + self.old_path = os.environ['PATH'] self.old_home = os.environ['HOME'] self.tempdir = tempfile.mkdtemp(prefix="leap_tests-") diff --git a/server/pkg/requirements-latest.pip b/server/pkg/requirements-latest.pip new file mode 100644 index 00000000..a629aa57 --- /dev/null +++ b/server/pkg/requirements-latest.pip @@ -0,0 +1,8 @@ +--index-url https://pypi.python.org/simple/ + +--allow-external u1db --allow-unverified u1db +--allow-external dirspec --allow-unverified dirspec + +-e 'git+https://github.com/pixelated-project/leap_pycommon.git@develop#egg=leap.common' +-e '../common' +-e . |