Skip to content

Commit 08ab423

Browse files
committed
Tests for workflow testing script.
Workflow testing script added in b28e037.
1 parent 9026b93 commit 08ab423

4 files changed

Lines changed: 35 additions & 2 deletions

File tree

.travis.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
language: python
2-
sudo: false
2+
sudo: true
33
python: 2.7
44
env:
55
global:
@@ -18,6 +18,8 @@ env:
1818
- TOX_ENV=py34-gx-1801
1919
- TOX_ENV=py34-gx-dev
2020
- TOX_ENV=py34-gx-1709
21+
- TOX_ENV=py27-gxwf-test-test PLANEMO_TEST_STYLE=docker_test
22+
- TOX_ENV=py27-gxwf-test-test PLANEMO_TEST_STYLE=serve_and_test
2123
- TOX_ENV=py27-lint-docstrings
2224

2325
install:
@@ -26,6 +28,7 @@ install:
2628
matrix:
2729
allow_failures:
2830
- env: TOX_ENV=py27-lint-docstrings
31+
- env: TOX_ENV=py27-gxwf-test-test PLANEMO_TEST_STYLE=docker_test
2932

3033
script: tox -e $TOX_ENV
3134

@@ -34,3 +37,4 @@ after_success:
3437

3538
services:
3639
- postgresql
40+
- docker

Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,9 @@ test: ## run tests with the default Python (faster than tox)
8181
quick-test: ## run quickest tests with the default Python
8282
$(IN_VENV) PLANEMO_SKIP_SLOW_TESTS=1 PLANEMO_SKIP_GALAXY_TESTS=1 nosetests $(NOSE_TESTS)
8383

84+
gxwf-test-test: ## run test of workflow testing script
85+
bash $(BUILD_SCRIPTS_DIR)/test_workflow_tests.sh
86+
8487
tox: ## run tests with tox in the specified ENV, defaults to py27
8588
$(IN_VENV) tox -e $(ENV) -- $(ARGS)
8689

scripts/test_workflow_tests.sh

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
#!/bin/bash
2+
3+
# Ensure working directory is planemo project.
4+
SCRIPTS_DIRECTORY="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
5+
PROJECT_DIRECTORY="${SCRIPTS_DIRECTORY}/.."
6+
7+
TEMP_DIRECTORY=`mktemp -d 2>/dev/null || mktemp -d -t 'planemowftest'`
8+
cp "$SCRIPTS_DIRECTORY/run_galaxy_workflow_tests.sh" "$TEMP_DIRECTORY"
9+
cp "$PROJECT_DIRECTORY/tests/data/"wf4* "$TEMP_DIRECTORY"
10+
cp "$PROJECT_DIRECTORY/tests/data/1.bed" "$TEMP_DIRECTORY"
11+
12+
cd $PROJECT_DIRECTORY
13+
14+
# Build Planemo wheel.
15+
make dist
16+
17+
# Test against wheel.
18+
export PLANEMO_TARGET="$PROJECT_DIRECTORY/dist/planemo*whl"
19+
20+
cd $TEMP_DIRECTORY
21+
bash run_workflow_tests.sh "wf4-distro-tools.gxwf.yml"

tox.ini

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# TODO: implement doc linting
22
[tox]
3-
envlist = py{27,34}-lint, py{27,34,35}-quick, py27-lint-imports, py27-lint-docstrings, py27-lint-readme, py27-lint-docs, py{27,34,35}, py{27,34,35}-gx-{master,dev,1801,1709,1705}
3+
envlist = py{27,34}-lint, py{27,34,35}-quick, py27-lint-imports, py27-lint-docstrings, py27-lint-readme, py27-lint-docs, py{27,34,35}, py{27,34,35}-gx-{master,dev,1801,1709,1705}, py27-gxwf-test-test
44
source_dir = planemo
55
test_dir = tests
66

@@ -64,3 +64,8 @@ whitelist_externals = make
6464
deps =
6565
-rrequirements.txt
6666
-rdev-requirements.txt
67+
68+
[testenv:py27-gxwf-test-test]
69+
commands = make gxwf-test-test
70+
skip_install = True
71+
whitelist_externals = make

0 commit comments

Comments
 (0)