Browse Source

Make runtest.sh exit status consistent solves #249

Yann Weber 7 years ago
parent
commit
fa8bf06f15
3 changed files with 13 additions and 5 deletions
  1. 5
    2
      progs/slim/install_model/loader.py
  2. 5
    2
      runtest.sh
  3. 3
    1
      runtest_context.sh

+ 5
- 2
progs/slim/install_model/loader.py View File

@@ -72,11 +72,14 @@ if __name__ == '__main__':
72 72
         else:
73 73
             dpath = '.'
74 74
         with open(sys.argv[1]+'/context_tests.log', 'w') as logfile:
75
-            unittest.TextTestRunner(
75
+            tests_res = unittest.TextTestRunner(
76 76
                 logfile,
77 77
                 failfast = '-f' in sys.argv,
78 78
                 verbosity = 2 if '-v' in sys.argv else 1).run(suite)
79
-        exit()
79
+        if tests_res.wasSuccessful():
80
+            exit(0)
81
+        else:
82
+            exit(1)
80 83
 
81 84
     lodel = LodelContext.get()
82 85
     import leapi_dyncode as dyncode

+ 5
- 2
runtest.sh View File

@@ -63,8 +63,10 @@ else
63 63
 fi
64 64
 
65 65
 PYTHON='env python3'
66
-$PYTHON ./nocontext_tests.py $logdir $@
67
-./runtest_context.sh $logdir $@
66
+ret_status=0
67
+
68
+$PYTHON ./nocontext_tests.py $logdir $@ || ret_status=1
69
+./runtest_context.sh $logdir $@ || ret_status=1
68 70
 
69 71
 if [[ $logdisplay -eq 1 || $logdisplay -eq 2 ]]
70 72
 then
@@ -79,3 +81,4 @@ then
79 81
     fi
80 82
 fi
81 83
 
84
+exit $ret_status

+ 3
- 1
runtest_context.sh View File

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

Loading…
Cancel
Save