Use pytest to run unit and doctests

fainaszar · Aug 25, 2018 · 1c64cdd · 1c64cdd
1 parent d476fcc
commit 1c64cdd
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/pytest.ini b/pytest.ini
@@ -1,5 +1,5 @@
 [pytest]
-log_cli = true
+addopts = --doctest-continue-on-failure
 log_level = DEBUG
 python_paths = lib
 markers =

diff --git a/run_tests.sh b/run_tests.sh
@@ -506,12 +506,13 @@ do
           ;;
       -u|-unit|--unit)
           report_file="run_unit_tests.html"
-          test_script="./scripts/nosetests.py"
+          test_script="pytest"
+          unit_extra='--doctest-modules --ignore lib/galaxy/webapps/tool_shed/controllers --ignore lib/galaxy/jobs/runners/chronos.py --ignore lib/galaxy/webapps/tool_shed/model/migrate --ignore lib/galaxy/util/jstree.py'
           if [ $# -gt 1 ]; then
-              unit_extra=$2
+              unit_extra="$unit_extra $2"
               shift 2
           else
-              unit_extra='--exclude=functional --exclude="^get" --exclude=controllers --exclude=runners --exclude dictobj --exclude=jstree lib test/unit'
+              unit_extra="$unit_extra lib test/unit"
               shift 1
           fi
           ;;

diff --git a/tox.ini b/tox.ini
@@ -42,8 +42,6 @@ setenv =
     GALAXY_VIRTUAL_ENV={envdir}
     GALAXY_ENABLE_BETA_COMPRESSED_GENBANK_SNIFFING=1
 deps =
-    nose
-    NoseHTML
     mock
     mock-ssh-server
 
@@ -65,8 +63,6 @@ whitelist_externals = bash
 setenv =
     GALAXY_VIRTUAL_ENV={envdir}
 deps =
-    nose
-    NoseHTML
     mock
     mock-ssh-server