summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitlab-ci.yml2
-rw-r--r--pkg/requirements-testing.pip1
-rwxr-xr-xpkg/tools/checkout_leap.sh9
-rw-r--r--tox.ini27
4 files changed, 22 insertions, 17 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000..fdcd83b
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,2 @@
+test:
+ script: pkg/tools/checkout_leap.sh && tox --recreate -e py27-dev
diff --git a/pkg/requirements-testing.pip b/pkg/requirements-testing.pip
index aa6bfe6..0a68f0b 100644
--- a/pkg/requirements-testing.pip
+++ b/pkg/requirements-testing.pip
@@ -5,3 +5,4 @@ coverage
pytest
pytest-pep8
pytest-cov
+setuptools-trial
diff --git a/pkg/tools/checkout_leap.sh b/pkg/tools/checkout_leap.sh
new file mode 100755
index 0000000..082ff8f
--- /dev/null
+++ b/pkg/tools/checkout_leap.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+if [ ! -d "../leap_commondev" ]; then
+ git clone https://github.com/leapcode/leap_pycommon ../leap_commondev
+fi
+if [ ! -d "../soledaddev" ]; then
+ git clone https://github.com/leapcode/soledad ../soledaddev
+fi
+cd ../leap_commondev && git checkout develop && git pull origin develop
+cd ../soledaddev && git checkout develop && git pull origin develop
diff --git a/tox.ini b/tox.ini
index 0da75a6..07c04b1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,12 +8,7 @@ commands = py.test --cov-report=html \
-k 'not bench' \
--pep8 {posargs}
deps =
- mock
- pep8
- pytest
- pytest-pep8
- pytest-cov
- setuptools-trial
+ -r{toxinidir}/pkg/requirements-testing.pip
gnupg
leap.soledad.client
-e.
@@ -21,19 +16,17 @@ setenv =
HOME=/tmp
[testenv:py27-dev]
-# This environment assumes developer has checked out
-# leap_common and soledad repos in the parent folder.
+# This environment assumes leap_common and soledad repos
+# are in the parent folder.
+# Use pkg/tools/checkout_leap.sh script to checkout those.
+commands =
+ py.test -k 'not bench' {posargs}
deps =
- mock
- pep8
- pytest
- pytest-pep8
- pytest-cov
- setuptools-trial
+ -r{toxinidir}/pkg/requirements-testing.pip
gnupg
- -e../leap_common
- -e../soledad/common
- -e../soledad/client
+ -e../leap_commondev
+ -e../soledaddev/common
+ -e../soledaddev/client
-e.
[testenv:py27-bench]