Skip to content

Commit

Permalink
Cleanup testing code
Browse files Browse the repository at this point in the history
  • Loading branch information
azvoleff committed Nov 6, 2022
1 parent 00ac978 commit 41471a2
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 55 deletions.
4 changes: 0 additions & 4 deletions docker/trends-earth-test-pre-scripts.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,3 @@ ln -sf /tests_directory/LDMP /root/.local/share/QGIS/QGIS3/profiles/default/pyth

pip3 install -r /tests_directory/requirements.txt
pip3 install -r /tests_directory/requirements-dev.txt

# Ensure that ui files are compiled
cd /tests_directory
invoke compile_files
17 changes: 4 additions & 13 deletions rundockertests.sh
Original file line number Diff line number Diff line change
@@ -1,20 +1,11 @@
#!/bin/bash
# Run docker tests on your local machine

PLUGIN_NAME="LDMP"
cat .env

DOCKER_RUN_COMMAND="docker exec -it trendsearth_qgis_1 sh -c"
source .env

docker-compose down -v
docker pull "qgis/qgis":${QGIS_VERSION_TAG}
docker-compose up -d
docker-compose ps

sleep 10

# Setup
$DOCKER_RUN_COMMAND "qgis_setup.sh $PLUGIN_NAME"
$DOCKER_RUN_COMMAND "cd /tests_directory && git submodule update --init --recursive"
$DOCKER_RUN_COMMAND "cd /tests_directory && paver setup && paver package --tests"

# Run the tests
$DOCKER_RUN_COMMAND "DISPLAY=:99 QT_X11_NO_MITSHM=1 GSHOSTNAME=boundless-test qgis_testrunner.sh LDMP.test.testplugin"
docker-compose exec -T qgis-testing-environment qgis_testrunner.sh LDMP.test.testplugin
38 changes: 0 additions & 38 deletions rundockertests_travis.bat

This file was deleted.

0 comments on commit 41471a2

Please sign in to comment.