Software / code / prosody
Changeset
6826:17a4e89a4780
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 04 Sep 2015 11:11:40 +0100 |
| parents | 6822:621384d89a44 (current diff) 6825:766aa454c79f (diff) |
| children | 6827:19c4532946b3 |
| files | net/http.lua |
| diffstat | 2 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/run_tests.sh Thu Sep 03 23:49:15 2015 +0200 +++ b/tests/run_tests.sh Fri Sep 04 11:11:40 2015 +0100 @@ -1,3 +1,3 @@ #!/bin/sh rm reports/*.report -lua test.lua $* +exec lua test.lua $*
--- a/tests/test.lua Thu Sep 03 23:49:15 2015 +0200 +++ b/tests/test.lua Fri Sep 04 11:11:40 2015 +0100 @@ -6,7 +6,7 @@ -- COPYING file in the source package for more information. -- - +local tests_passed = true; function run_all_tests() package.loaded["net.connlisteners"] = { get = function () return {} end }; @@ -99,6 +99,7 @@ local success, ret = pcall(tests[fname]); debug.sethook(); if not success then + tests_passed = false; print("TEST FAILED! Unit: ["..testname.."] Function: ["..fname.."]"); print(" Location: "..ret:gsub(":%s*\n", "\n")); line_info(fname, false, report_file); @@ -171,6 +172,7 @@ local success, ret = pcall(test, f, unit); debug.sethook(); if not success then + tests_passed = false; print("TEST FAILED! Unit: ["..unitname.."] Function: ["..name.."]"); print(" Location: "..ret:gsub(":%s*\n", "\n")); line_info(name, false, report_file); @@ -190,6 +192,7 @@ if success and verbosity >= 2 then print("SUBTEST PASSED: "..(msg or "(no description)")); elseif (not success) and verbosity >= 0 then + tests_passed = false; print("SUBTEST FAILED: "..(msg or "(no description)")); error(ret, 0); end @@ -237,3 +240,5 @@ end run_all_tests() + +os.exit(tests_passed and 0 or 1);
