diff options
author | Ingela Anderton Andin <[email protected]> | 2014-03-21 15:23:22 +0100 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2014-03-21 15:23:22 +0100 |
commit | bbe92ec2c359373205149dabc61ef0d50784760f (patch) | |
tree | 676f4e5ef29372ae03177015ac5854a99e4982e6 /lib/inets/test/httpd_basic_SUITE.erl | |
parent | 425a75a11ea58125b67ad56f4ed3ca65370a3e72 (diff) | |
parent | 57f446a999b01dcda42459d2f9f4e6b87d50a128 (diff) | |
download | otp-bbe92ec2c359373205149dabc61ef0d50784760f.tar.gz otp-bbe92ec2c359373205149dabc61ef0d50784760f.tar.bz2 otp-bbe92ec2c359373205149dabc61ef0d50784760f.zip |
Merge branch 'ia/inets/revert/OTP-11756'
* ia/inets/revert/OTP-11756:
inets: Continue CTify test suite
inets: Enable https tests
inets: Make test suites independent of each other
inets: Reverted commmit f97cd6965ac35d1cbe510de23592956857d144c8
Diffstat (limited to 'lib/inets/test/httpd_basic_SUITE.erl')
-rw-r--r-- | lib/inets/test/httpd_basic_SUITE.erl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/inets/test/httpd_basic_SUITE.erl b/lib/inets/test/httpd_basic_SUITE.erl index 2d06f3e70c..fbe65145dc 100644 --- a/lib/inets/test/httpd_basic_SUITE.erl +++ b/lib/inets/test/httpd_basic_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2007-2012. All Rights Reserved. +%% Copyright Ericsson AB 2007-2014. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -65,7 +65,8 @@ end_per_group(_GroupName, Config) -> init_per_suite(Config) -> tsp("init_per_suite -> entry with" "~n Config: ~p", [Config]), - ok = inets:start(), + inets_test_lib:stop_apps([inets]), + inets_test_lib:start_apps([inets]), PrivDir = ?config(priv_dir, Config), DataDir = ?config(data_dir, Config), |