Skip to content

Commit f8e854f

Browse files
committed
Tests for workflow testing script.
Workflow testing script added in b28e037.
1 parent 4b9b1a5 commit f8e854f

4 files changed

Lines changed: 42 additions & 1 deletion

File tree

.travis.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
language: python
2+
sudo: true
23
matrix:
34
include:
45
- python: 3.7
@@ -13,11 +14,17 @@ matrix:
1314
env: TOX_ENV=py37-unit-nonredundant-noclientbuild-noshed-gx-master
1415
- python: 3.7
1516
env: TOX_ENV=py37-unit-diagnostic-serveshedcmd-gx-master
17+
- python: 3.7
18+
env: TOX_ENV=py37-gxwf_test_test
1619
allow_failures:
1720
- env: TOX_ENV=py37-lint_docstrings
1821
- env: TOX_ENV=py37-unit-diagnostic-serveshedcmd-gx-master
22+
- env: TOX_ENV=py37-gxwf_test_test PLANEMO_TEST_STYLE=docker_test
1923

2024
install:
2125
- pip install tox
2226

2327
script: tox -e $TOX_ENV
28+
services:
29+
- postgresql
30+
- docker

Makefile

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

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

scripts/test_workflow_tests.sh

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
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+
ls
22+
bash run_galaxy_workflow_tests.sh "wf4-distro-tools.gxwf.yml"

tox.ini

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[tox]
2-
envlist = py{36}-lint, py36-unit-quick, py36-lint_docstrings, py36-lint_docs, py{36,37}-unit
2+
envlist = py{36}-lint, py36-unit-quick, py36-lint_docstrings, py36-lint_docs, py{36,37}-unit, py36-gxwf_test_test
33
source_dir = planemo
44
test_dir = tests
55

@@ -10,12 +10,14 @@ commands =
1010
lint_docstrings: flake8 --ignore='D107,D401,D105' {[tox]source_dir}
1111
unit: pytest {env:PYTEST_FAIL_FAIL:} {env:PYTEST_CAPTURE:} -m {env:PYTEST_MARK:""} {env:PYTEST_TARGET:{[tox]test_dir}} {posargs}
1212
mypy: mypy {[tox]source_dir} {posargs}
13+
gxwf_test_test: make setup-venv gxwf-test-test
1314

1415
passenv =
1516
PLANEMO_*
1617
PG*
1718
HOME
1819
DOCS
20+
1921
deps =
2022
lint: flake8-import-order
2123
lint,lint_docstrings: flake8
@@ -27,6 +29,7 @@ deps =
2729
unit: coverage
2830
unit: flask
2931
mypy: mypy
32+
3033
setenv =
3134
gx: PYTEST_MARK="tests_galaxy_branch"
3235
diagnostic: PLANEMO_TEST_VERBOSE=1
@@ -54,9 +57,15 @@ setenv =
5457
2005: PLANEMO_TEST_GALAXY_BRANCH=release_20.05
5558
2001: PLANEMO_TEST_GALAXY_BRANCH=release_20.01
5659
skip_install =
60+
<<<<<<< HEAD
5761
doc_test,lint,lint_docs,lint_docstrings,mypy: True
62+
=======
63+
doc_test,lint,lint_docs,lint_docstrings,gxwf_test_test: True
64+
>>>>>>> 08a8ee74... Tests for workflow testing script.
5865
whitelist_externals =
5966
lint_docs: make
67+
gxwf_test_test: make
68+
6069

6170
[testenv:doc_test]
6271
commands = bash scripts/run_doc_test.sh

0 commit comments

Comments
 (0)