diff options
author | Ingela Anderton Andin <[email protected]> | 2016-04-29 17:25:36 +0200 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2016-05-23 18:21:11 +0200 |
commit | 7fd0a4e3d40178126cc8b31238eb7c2697fdd0b9 (patch) | |
tree | 62e5c69bde3ff611d4da725939a50a04673d20de /lib/inets/test/http_format_SUITE.erl | |
parent | c8cd6f30021d5f28e06d89a6acf834d770b9e972 (diff) | |
download | otp-7fd0a4e3d40178126cc8b31238eb7c2697fdd0b9.tar.gz otp-7fd0a4e3d40178126cc8b31238eb7c2697fdd0b9.tar.bz2 otp-7fd0a4e3d40178126cc8b31238eb7c2697fdd0b9.zip |
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.
Diffstat (limited to 'lib/inets/test/http_format_SUITE.erl')
-rw-r--r-- | lib/inets/test/http_format_SUITE.erl | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/lib/inets/test/http_format_SUITE.erl b/lib/inets/test/http_format_SUITE.erl index e977bd1b9b..a2b463e98c 100644 --- a/lib/inets/test/http_format_SUITE.erl +++ b/lib/inets/test/http_format_SUITE.erl @@ -55,13 +55,9 @@ end_per_group(_GroupName, Config) -> init_per_testcase(_, Config) -> - Dog = test_server:timetrap(?t:minutes(1)), - NewConfig = lists:keydelete(watchdog, 1, Config), - [{watchdog, Dog} | NewConfig]. + Config. -end_per_testcase(_, Config) -> - Dog = ?config(watchdog, Config), - test_server:timetrap_cancel(Dog), +end_per_testcase(_, _) -> ok. %%------------------------------------------------------------------------- |