diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1f8e79fa7032430dbc4488cc126da080ddeadccf..92d1235b00a0b85fef20a72c8b9e0214e5e5aa36 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -50,5 +50,4 @@ test_sqlite: doctests: stage: UnitTests script: - - export LT_CFG=Voiture - - test/scripts/doctests.sh + - test/scripts/run_doctest.sh diff --git a/labelstower/getter.py b/labelstower/getter.py index 7a73e4861294a215c89a7ae68903b140ab8c22c3..721402c74fb3bb430f00c2488835c6945a1aba55 100644 --- a/labelstower/getter.py +++ b/labelstower/getter.py @@ -209,16 +209,3 @@ def get_user_selection(number_of_mandatory_labels: int, optional1: str, optional id_mandatory_labels = optional2 id_forbiden_labels = optional1 return id_mandatory_labels, id_forbiden_labels - -if __name__ == "__main__": - - from flask import Flask - from flask_sqlalchemy import SQLAlchemy - import os - - app = Flask(__name__) - app.config.from_object(os.environ['LABELSTOWER_ENV']) - bp.db = SQLAlchemy(app) - - import doctest - doctest.testmod(verbose=True) \ No newline at end of file diff --git a/test/scripts/run_doctest.py b/test/scripts/run_doctest.py new file mode 100755 index 0000000000000000000000000000000000000000..8425683ba2d4288534abafefb70bae0f63e939eb --- /dev/null +++ b/test/scripts/run_doctest.py @@ -0,0 +1,15 @@ +#!/usr/bin/env python3 + +import os +from flask import Flask +from flask_sqlalchemy import SQLAlchemy + +app = Flask(__name__) +app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///../instance/Voiture.sqlite' +app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False + +import labelstower +labelstower.bp.db = SQLAlchemy(app) + +import doctest +doctest.testmod(labelstower.getter,verbose=True) diff --git a/test/scripts/doctests.sh b/test/scripts/run_doctest.sh similarity index 65% rename from test/scripts/doctests.sh rename to test/scripts/run_doctest.sh index 067a1bfbf75ae85cdab02b5c9e88dd40e80ad0c7..86ff8afccb5cdc1917985350a704cc6471857a4b 100755 --- a/test/scripts/doctests.sh +++ b/test/scripts/run_doctest.sh @@ -5,7 +5,9 @@ SCRIPT_NAME=${BASH_SOURCE[0]} cd `dirname ${SCRIPT_NAME}` -export LABELSTOWER_ENV="demo.config.Config${LT_CFG}" +PWD=`pwd` +UP1=`dirname ${PWD}` +export PYTHONPATH=`dirname ${UP1}` + +./run_doctest.py -cd ../.. -python3 labelstower/getter.py