From efced3ee9e227f30078503ed2584dbbe6f4615e1 Mon Sep 17 00:00:00 2001 From: "Kali Kaneko (leap communications)" Date: Mon, 27 Feb 2017 17:17:46 +0100 Subject: [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. --- tox.ini | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'tox.ini') diff --git a/tox.ini b/tox.ini index 5d0dfa11..b61f9e2a 100644 --- a/tox.ini +++ b/tox.ini @@ -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/ -- cgit v1.2.3