Merge branch 'master' into lodelsites-dev

progs/slim/install_model/loader.py

@@ -72,11 +72,14 @@ if __name__ == '__main__':
         else:
             dpath = '.'
         with open(sys.argv[1]+'/context_tests.log', 'w') as logfile:
-            unittest.TextTestRunner(
+            tests_res = unittest.TextTestRunner(
                 logfile,
                 failfast = '-f' in sys.argv,
                 verbosity = 2 if '-v' in sys.argv else 1).run(suite)
-        exit()
+        if tests_res.wasSuccessful():
+            exit(0)
+        else:
+            exit(1)
 
     lodel = LodelContext.get()
     import leapi_dyncode as dyncode

runtest.sh

@@ -63,15 +63,17 @@ else
 fi
 
 PYTHON='env python3'
-$PYTHON ./nocontext_tests.py $logdir $@
-./runtest_context.sh $logdir $@
+ret_status=0
+
+$PYTHON ./nocontext_tests.py $logdir $@ || ret_status=1
+./runtest_context.sh $logdir $@ || ret_status=1
 
 if [[ $logdisplay -eq 1 || $logdisplay -eq 2 ]]
 then
     logfiles=$(ls $logdir)
     for logfile in $logfiles
     do
-        more $logdir/$logfile
+        cat $logdir/$logfile
     done
     if [[ $logdisplay -eq 2 ]]
     then 
@@ -79,3 +81,4 @@ then
     fi
 fi
 
+exit $ret_status

runtest_context.sh

@@ -70,6 +70,8 @@ chmod +x lodel_admin.py
 rm -R conf.d && mv tests/tests_conf.d conf.d
 make
 make refresh_plugins
-$PYTHON loader.py $@
+$PYTHON loader.py $@ && ret_status=0 || ret_status=1
 
 rm -Rf $testdir
+
+exit $ret_status