Tests enhancements 3

nocontext_tests.py

@@ -1,13 +1,37 @@
 #-*- coding: utf-8 -*-
 
+##@brief Loader for tests which do not need an lodel installation
+#
+# Options
+################
+# 
+# @note We can pass the path to a directory to write results file, nocontext_tests.log
+# It has to be at first, otherwise it will not be taken 
+# and the default one, current directory, will be used.
+# The results are not displayed, only stored in nocontext_tests.log
+#
+# -f, --failfast
+#
+#    Stop the test run on the first error or failure.
+# -v --verbose
+#
+#   higher verbosity
+#
+#
+
 import sys, os, os.path
 import unittest
 import nocontext_tests
 
 loader = unittest.TestLoader()
 
+if ((len(sys.argv) > 1) and (sys.argv[1].startswith('-')) is False):
+	dpath = sys.argv[1]
+else:
+	dpath = '.'
+
 suite = loader.discover('tests', pattern='nc_test*.py')
-with open(sys.argv[1]+'/nocontext_tests.log', 'w') as logfile:
+with open(dpath+'/nocontext_tests.log', 'w') as logfile:
     unittest.TextTestRunner(
     	logfile,
         failfast = '-f' in sys.argv,

progs/slim/install_model/loader.py

@@ -5,6 +5,9 @@
 #@note If you want to avoid settings loading you can set the environment
 #variable LODEL2_NO_SETTINGS_LOAD (see @ref install.lodel_admin.update_plugin_discover_cache()
 #
+# @note In tests case, you can pass the path to write results file, context_tests.log 
+# It has to be at first, otherwise it will not be taken 
+# and the default one, current directory, will be used.
 
 import sys, os, os.path
 #
@@ -64,6 +67,10 @@ if __name__ == '__main__':
         loader = unittest.TestLoader()
         test_dir = os.path.join(LODEL2_LIB_ABS_PATH, 'tests')
         suite = loader.discover(test_dir, pattern='test*.py')
+        if ((len(sys.argv) > 1) and (sys.argv[1].startswith('-')) is False):
+            dpath = sys.argv[1]
+        else:
+            dpath = '.'
         with open(sys.argv[1]+'/context_tests.log', 'w') as logfile:
             unittest.TextTestRunner(
                 logfile,

runtest.sh

@@ -6,7 +6,6 @@
 # Running all discoverables tests :
 # ./runtest
 #
-# Options
 ################
 # -f, --failfast
 #
@@ -19,6 +18,11 @@
 # -d 1 : results are displayed when tests finish and kept in logfiles in /tmp/logXXXXXXX repository, with XXXXXXX a timestamp
 # -d 2 : results are displayed when tests finish, they are not stored
 #
+# Furthermore
+################
+# Most of the tests need an install of lodel for dependencies reasons
+# For those which not need, prefix the python file by 'nc_' (example nc_test_query.py)
+# they will be executed outside a lodel install
 # More details :
 ################
 #