diff options
author | Kali Kaneko (leap communications) <kali@leap.se> | 2017-02-27 17:17:46 +0100 |
---|---|---|
committer | Kali Kaneko (leap communications) <kali@leap.se> | 2017-02-27 17:19:23 +0100 |
commit | efced3ee9e227f30078503ed2584dbbe6f4615e1 (patch) | |
tree | e06b2e078cc58ba42ded99287b70b0a077717db4 /tox.ini | |
parent | 1a9968c1e2592be5baae4bf2c6551ad7f5228f17 (diff) |
[tests] let's pick soledad master again
after merging
https://0xacab.org/leap/soledad/merge_requests/64
we're ready to change the calls to soledad with the new offline
parameter, so we need to use master in the tests that are run on the CI
again.
Diffstat (limited to 'tox.ini')
-rw-r--r-- | tox.ini | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -18,14 +18,15 @@ setenv = [testenv:py27-dev] # This is the environment that the Gitlab CI runs normally +# we want to pick latest in soledad master and pycommon master commands = py.test -k 'not bench' --pep8 {posargs} deps = -r{toxinidir}/pkg/requirements-testing.pip gnupg -egit+https://0xacab.org/leap/leap_pycommon@master#egg=leap.common - -egit+https://0xacab.org/leap/soledad@develop#egg=leap.soledad.common&subdirectory=common - -egit+https://0xacab.org/leap/soledad@develop#egg=leap.soledad.client&subdirectory=client + -egit+https://0xacab.org/leap/soledad@master#egg=leap.soledad.common&subdirectory=common + -egit+https://0xacab.org/leap/soledad@master#egg=leap.soledad.client&subdirectory=client setenv = HOME=/tmp PATH=/usr/bin/:/bin/ |