inets: Use test_server app tests and remove legacy test_server code

FTP tests needed some refactoring as some tests where lost to
the ftp_suite_lib module that was not run.

1 files changed, 0 insertions, 88 deletions

diff --git a/lib/inets/test/inets_test_lib.hrl b/lib/inets/test/inets_test_lib.hrl
index a36ab0b1cf..d436395290 100644
--- a/lib/inets/test/inets_test_lib.hrl
+++ b/lib/inets/test/inets_test_lib.hrl
@@ -21,96 +21,8 @@
 %%----------------------------------------------------------------------
 %% Purpose: Define common macros for testing
 %%----------------------------------------------------------------------
-
-%% - Print macros - 
-
--ifdef(inets_debug).
--define(DEBUG(F,A), inets_test_lib:debug(F, A, ?MODULE, ?LINE)).
--else.
--define(DEBUG(F,A),ok).
--endif.
-
--ifdef(inets_log).
--define(LOG(F,A),   inets_test_lib:log(F, A, ?MODULE, ?LINE)).
--else.
--define(LOG(F,A),ok).
--endif.
-
--define(INFO(F,A),  inets_test_lib:info(F, A, ?MODULE, ?LINE)).
--define(PRINT(F,A), inets_test_lib:print(F, A, ?MODULE, ?LINE)).
-
-
-%% - Macros stolen from the test server -
-
--ifndef(line).
--define(line,put(test_server_loc,{?MODULE,?LINE}),).
--endif.
-
-
-%% - OS Command and stuff
-
--define(OSCMD(Cmd), inets_test_lib:oscmd(Cmd)).
-
--define(PRINT_SYSTEM_INFO(P), inets_test_lib:print_system_info(P)).
-
--define(RUN_ON_OS(OS, FUN),  inets_test_lib:run_on_os(OS, FUN)).
--define(RUN_ON_WINDOWS(FUN), inets_test_lib:run_on_windows(FUN)).
-
-
-%% - Test case macros -
-
--define(EXPANDABLE(I, C, F), inets_test_lib:expandable(I, C, F)).
--define(OS_BASED_SKIP(Skippable),
-        inets_test_lib:os_based_skip(Skippable)).
-
--define(NON_PC_TC_MAYBE_SKIP(Config, Condition),
-        inets_test_lib:non_pc_tc_maybe_skip(Config, Condition, ?MODULE, ?LINE)).
-
-
-
 %% - Misc macros -
 
 -define(ENSURE_STARTED(A), inets_test_lib:ensure_started(A)).
--define(UPDATE(K,V,C),     inets_test_lib:update_config(K,V,C)).
--define(CONFIG(K,C),       inets_test_lib:get_config(K,C)).
--define(HOSTNAME(),        inets_test_lib:hostname()).
--define(SZ(X),             inets_test_lib:sz(X)).
-
-
-%% - Test case macros - 
-
--define(SKIP(Reason),   inets_test_lib:skip(Reason, ?MODULE, ?LINE)).
--define(FAIL(Reason),   inets_test_lib:fail(Reason, ?MODULE, ?LINE)).
-
-
-%% - Socket macros -
-
--define(CONNECT(M,H,P),   inets_test_lib:connect(M,H,P)).
--define(SEND(M,S,D),      inets_test_lib:send(M,S,D)).
--define(CSEND(M,S,D,C,T), inets_test_lib:csend(M,S,D,C,T)).
--define(CLOSE(M,S),       inets_test_lib:close(M,S)).
-
-
-%% - Time macros -
-
--define(HOURS(N),       inets_test_lib:hours(N)).
--define(MINS(N),        inets_test_lib:minutes(N)).
--define(SECS(N),        inets_test_lib:seconds(N)).
-
--define(WD_START(T),    inets_test_lib:watchdog_start(T)).
--define(WD_STOP(P),     inets_test_lib:watchdog_stop(P)).
-
--define(SLEEP(MSEC),    inets_test_lib:sleep(MSEC)).
--define(M(),            inets_test_lib:millis()).
--define(MDIFF(A,B),     inets_test_lib:millis_diff(A,B)).
-
-
-%% - Process utility macros - 
-
--define(FLUSH(),        inets_test_lib:flush_mqueue()).
--define(ETRAP_GET(),    inets_test_lib:trap_exit()).
--define(ETRAP_SET(O),   inets_test_lib:trap_exit(O)).
-
-