diff options
| author | Kali Kaneko <kali@leap.se> | 2015-08-03 14:23:22 -0400 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2015-08-03 14:23:22 -0400 |
| commit | e6c89cab3d0660756524d3fe631d4b1f96834b54 (patch) | |
| tree | 51c597da8159663d5b7e86c917b40931b3be6abf /common | |
| parent | 351d393b6e2c98c5573d8afa26f5f4b346cac554 (diff) | |
| parent | 54afb28b372118b0f08d0567b27034dd72fe63e7 (diff) | |
Merge remote-tracking branch 'leapcode/pr/237' into develop
Diffstat (limited to 'common')
| -rw-r--r-- | common/pkg/requirements-latest.pip | 6 | ||||
| -rw-r--r-- | common/src/leap/soledad/common/tests/util.py | 4 |
2 files changed, 9 insertions, 1 deletions
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-") |