aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets/test/inets_test_lib.erl
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2011-03-28 14:10:52 +0200
committerMicael Karlberg <[email protected]>2011-03-28 14:10:52 +0200
commit6ebe1ea0e4b9bf58f6a27bac75c7c5e700044682 (patch)
tree9ece8b65d5dae9f47bd5e5bc510cd746b66f3b83 /lib/inets/test/inets_test_lib.erl
parenta0ab2e0fa31a2599d0532ef87c944837e96153c0 (diff)
downloadotp-6ebe1ea0e4b9bf58f6a27bac75c7c5e700044682.tar.gz
otp-6ebe1ea0e4b9bf58f6a27bac75c7c5e700044682.tar.bz2
otp-6ebe1ea0e4b9bf58f6a27bac75c7c5e700044682.zip
A (hopefully) temporary skip of some of the httpc proxy
test cases.
Diffstat (limited to 'lib/inets/test/inets_test_lib.erl')
-rw-r--r--lib/inets/test/inets_test_lib.erl11
1 files changed, 9 insertions, 2 deletions
diff --git a/lib/inets/test/inets_test_lib.erl b/lib/inets/test/inets_test_lib.erl
index c56a714f5a..c837326bb5 100644
--- a/lib/inets/test/inets_test_lib.erl
+++ b/lib/inets/test/inets_test_lib.erl
@@ -32,7 +32,7 @@
-export([check_body/1]).
-export([millis/0, millis_diff/2, hours/1, minutes/1, seconds/1, sleep/1]).
-export([oscmd/1]).
--export([non_pc_tc_maybe_skip/4, os_based_skip/1]).
+-export([non_pc_tc_maybe_skip/4, os_based_skip/1, skip/3, fail/3]).
-export([flush/0]).
-export([start_node/1, stop_node/1]).
@@ -395,6 +395,13 @@ sleep(MSecs) ->
skip(Reason, File, Line) ->
exit({skipped, {Reason, File, Line}}).
+fail(Reason, File, Line) ->
+ String = lists:flatten(io_lib:format("Failure ~p(~p): ~p~n",
+ [File, Line, Reason])),
+ tsf(String).
+
+
+
flush() ->
receive
Msg ->
@@ -407,7 +414,7 @@ flush() ->
tsp(F) ->
tsp(F, []).
tsp(F, A) ->
- test_server:format("~p ~p:" ++ F ++ "~n", [self(), ?MODULE | A]).
+ test_server:format("~p ~p ~p:" ++ F ++ "~n", [node(), self(), ?MODULE | A]).
tsf(Reason) ->
test_server:fail(Reason).