aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2019-07-18 19:07:45 +0200
committerMicael Karlberg <[email protected]>2019-07-18 19:07:45 +0200
commitcfb78031058227e44c666f7ae1afdb035cf6b1cb (patch)
treeddb4190845c14ce967fee63cddfd43dd1086e95d /lib
parent46c579ac5d8d8d814b7fc8a86a11b5cd731c08c9 (diff)
downloadotp-cfb78031058227e44c666f7ae1afdb035cf6b1cb.tar.gz
otp-cfb78031058227e44c666f7ae1afdb035cf6b1cb.tar.bz2
otp-cfb78031058227e44c666f7ae1afdb035cf6b1cb.zip
[megaco|test] Improve handling of skip
The load test suite did not properly handle attempts to skip test cases. If we failed to start one of the slave nodes for whatever reason (in this case we got a timeout), this should not result in a failed test case as this is out of the control of the test case. As it was, we *did* try to issue a skip, but the "load controller" did not detect it. It instead transformed it into a regular error.
Diffstat (limited to 'lib')
-rw-r--r--lib/megaco/test/megaco_load_test.erl11
1 files changed, 11 insertions, 0 deletions
diff --git a/lib/megaco/test/megaco_load_test.erl b/lib/megaco/test/megaco_load_test.erl
index 66ee4931f2..9cce9e70ce 100644
--- a/lib/megaco/test/megaco_load_test.erl
+++ b/lib/megaco/test/megaco_load_test.erl
@@ -368,6 +368,17 @@ load_controller(Config, Fun) when is_list(Config) and is_function(Fun) ->
d("load_controller -> "
"loader [~p] terminated with ok~n", [Loader]),
ok;
+ {'EXIT', Loader, {skipped, {fatal, Reason, File, Line}}} ->
+ i("load_controller -> "
+ "loader [~p] terminated with fatal skip"
+ "~n Reason: ~p"
+ "~n At: ~p:~p", [Loader, Reason, File, Line]),
+ ?SKIP(Reason);
+ {'EXIT', Loader, {skipped, Reason}} ->
+ i("load_controller -> "
+ "loader [~p] terminated with skip"
+ "~n Reason: ~p", [Loader, Reason]),
+ ?SKIP(Reason);
{'EXIT', Loader, Reason} ->
i("load_controller -> "
"loader [~p] terminated with"