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_1_0.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_1_0.erl')
-rw-r--r-- | lib/inets/test/httpd_1_0.erl | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/inets/test/httpd_1_0.erl b/lib/inets/test/httpd_1_0.erl index 53f23b12e0..0836c9e881 100644 --- a/lib/inets/test/httpd_1_0.erl +++ b/lib/inets/test/httpd_1_0.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2013-2013. All Rights Reserved. +%% Copyright Ericsson AB 2013-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 @@ -20,7 +20,7 @@ -module(httpd_1_0). --export([host/4]). +-export([host/4, trace/4]). %%------------------------------------------------------------------------- %% Test cases @@ -31,3 +31,8 @@ host(Type, Port, Host, Node) -> "GET / HTTP/1.0\r\n\r\n", [{statuscode, 200}, {version, "HTTP/1.0"}]). +trace(Type, Port, Host, Node)-> + ok = httpd_test_lib:verify_request(Type, Host, Port, Node, + "TRACE / HTTP/1.0\r\n\r\n", + [{statuscode, 501}, + {version, "HTTP/1.0"}]). |