diff options
author | Ingela Anderton Andin <[email protected]> | 2016-05-25 09:58:34 +0200 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2016-05-25 09:58:34 +0200 |
commit | 90bd9b2921f61854771ba2924abd05fa32d46b1f (patch) | |
tree | 65032f3e0e628643971032282d15ff3e0bed0bbe /lib/inets/test/inets_socketwrap_SUITE.erl | |
parent | d5bacdbe0ff1a4327e5e502a0b8cfdddf76e5d86 (diff) | |
parent | 7fd0a4e3d40178126cc8b31238eb7c2697fdd0b9 (diff) | |
download | otp-90bd9b2921f61854771ba2924abd05fa32d46b1f.tar.gz otp-90bd9b2921f61854771ba2924abd05fa32d46b1f.tar.bz2 otp-90bd9b2921f61854771ba2924abd05fa32d46b1f.zip |
Merge branch 'ingela/inets/tests-enhancement'
* ingela/inets/tests-enhancement:
inets: Use test_server app tests and remove legacy test_server code
Diffstat (limited to 'lib/inets/test/inets_socketwrap_SUITE.erl')
-rw-r--r-- | lib/inets/test/inets_socketwrap_SUITE.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/inets/test/inets_socketwrap_SUITE.erl b/lib/inets/test/inets_socketwrap_SUITE.erl index cfbda3ccf5..18df995215 100644 --- a/lib/inets/test/inets_socketwrap_SUITE.erl +++ b/lib/inets/test/inets_socketwrap_SUITE.erl @@ -61,8 +61,8 @@ end_per_testcase(_, Config) -> start_httpd_fd() -> [{doc, "Start/stop of httpd service with socket wrapper"}]. start_httpd_fd(Config) when is_list(Config) -> - PrivDir = ?config(priv_dir, Config), - DataDir = ?config(data_dir, Config), + PrivDir = proplists:get_value(priv_dir, Config), + DataDir = proplists:get_value(data_dir, Config), HttpdConf = [{port, 80}, {ipfamily, inet}, {server_name, "httpd_fd_test"}, {server_root, PrivDir}, {document_root, PrivDir}, {bind_address, any}], @@ -94,7 +94,7 @@ start_httpd_fd(Config) when is_list(Config) -> start_tftpd_fd() -> [{doc, "Start/stop of tfpd service with socket wrapper"}]. start_tftpd_fd(Config) when is_list(Config) -> - DataDir = ?config(data_dir, Config), + DataDir = proplists:get_value(data_dir, Config), case setup_node_info(node()) of {skip, _} = Skip -> Skip; |