diff options
| author | Peter Andersson <[email protected]> | 2013-11-14 17:39:23 +0100 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2013-11-19 16:17:01 +0100 |
| commit | 093890dc793e85a09b40f1eca878f410c73cf625 (patch) | |
| tree | d1a4e8587a000f410fb243a7fffaf356976f18f2 /lib/test_server/test | |
| parent | 98c0e6608100da393df24722afea159a1f5dcc22 (diff) | |
| download | otp-093890dc793e85a09b40f1eca878f410c73cf625.tar.gz otp-093890dc793e85a09b40f1eca878f410c73cf625.tar.bz2 otp-093890dc793e85a09b40f1eca878f410c73cf625.zip | |
Modify the auto_skip report for group config funcs to include group name
Also correct failing test cases and find and fix remaining bugs.
Diffstat (limited to 'lib/test_server/test')
| -rw-r--r-- | lib/test_server/test/test_server_SUITE.erl | 14 | ||||
| -rw-r--r-- | lib/test_server/test/test_server_test_lib.erl | 5 |
2 files changed, 12 insertions, 7 deletions
diff --git a/lib/test_server/test/test_server_SUITE.erl b/lib/test_server/test/test_server_SUITE.erl index 8ad5fcfb5c..c4faac036b 100644 --- a/lib/test_server/test/test_server_SUITE.erl +++ b/lib/test_server/test/test_server_SUITE.erl @@ -117,7 +117,7 @@ test_server_shuffle01_SUITE(Config) -> test_server_skip_SUITE(Config) -> run_test_server_tests("test_server_skip_SUITE", [], - 3, 0, 1, 0, 0, 1, 3, 0, 0, Config). + 3, 0, 1, 0, 1, 0, 3, 0, 0, Config). test_server_conf01_SUITE(Config) -> run_test_server_tests("test_server_conf01_SUITE", [], @@ -248,11 +248,13 @@ run_test_server_tests(SuiteName, Skip, NCases, NFail, NExpected, NSucc, {NActualSkip,NActualFail,NActualSucc} = lists:foldl(fun(#tc{ result = skip },{S,F,Su}) -> {S+1,F,Su}; - (#tc{ result = ok },{S,F,Su}) -> - {S,F,Su+1}; - (#tc{ result = failed },{S,F,Su}) -> - {S,F+1,Su} - end,{0,0,0},Data#suite.cases), + (#tc{ result = auto_skip },{S,F,Su}) -> + {S+1,F,Su}; + (#tc{ result = ok },{S,F,Su}) -> + {S,F,Su+1}; + (#tc{ result = failed },{S,F,Su}) -> + {S,F+1,Su} + end,{0,0,0},Data#suite.cases), Data. translate_filename(Filename,EncodingOnTestNode) -> diff --git a/lib/test_server/test/test_server_test_lib.erl b/lib/test_server/test/test_server_test_lib.erl index cd6804f7ad..82a702d59f 100644 --- a/lib/test_server/test/test_server_test_lib.erl +++ b/lib/test_server/test/test_server_test_lib.erl @@ -17,6 +17,7 @@ %% %CopyrightEnd% %% -module(test_server_test_lib). + -export([parse_suite/1]). -export([init/2, pre_init_per_testcase/3, post_end_per_testcase/4]). @@ -185,7 +186,9 @@ parse_case("=result" ++ Result, _, Tc) -> "failed" ++ _ -> {ok, Tc#tc{ result = failed } }; "skipped" ++ _ -> - {ok, Tc#tc{ result = skip } } + {ok, Tc#tc{ result = skip } }; + "auto_skipped" ++ _ -> + {ok, Tc#tc{ result = auto_skip } } end; parse_case("=finished" ++ _ , _Fd, #tc{ name = undefined }) -> finished; |