aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/test/old_ssl_protocol_SUITE.erl
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2010-10-12 10:33:57 +0200
committerLukas Larsson <[email protected]>2011-02-17 17:25:12 +0100
commite895e8ae96264ed7b5a0cb5f30f5a0af3d076831 (patch)
treea91340413e4c2961bb2778f23e73c540405c720b /lib/ssl/test/old_ssl_protocol_SUITE.erl
parent65ff8409203e7154f4fbe03ed9d76ca7c1362eaf (diff)
downloadotp-e895e8ae96264ed7b5a0cb5f30f5a0af3d076831.tar.gz
otp-e895e8ae96264ed7b5a0cb5f30f5a0af3d076831.tar.bz2
otp-e895e8ae96264ed7b5a0cb5f30f5a0af3d076831.zip
Update ssl tests to conform with common_test standard
Diffstat (limited to 'lib/ssl/test/old_ssl_protocol_SUITE.erl')
-rw-r--r--lib/ssl/test/old_ssl_protocol_SUITE.erl25
1 files changed, 15 insertions, 10 deletions
diff --git a/lib/ssl/test/old_ssl_protocol_SUITE.erl b/lib/ssl/test/old_ssl_protocol_SUITE.erl
index a03333034a..2908de1450 100644
--- a/lib/ssl/test/old_ssl_protocol_SUITE.erl
+++ b/lib/ssl/test/old_ssl_protocol_SUITE.erl
@@ -20,13 +20,13 @@
%%
-module(old_ssl_protocol_SUITE).
--export([all/1, init_per_testcase/2, end_per_testcase/2, config/1,
+-export([all/0,groups/0,init_per_group/2,end_per_group/2, init_per_testcase/2, end_per_testcase/2, config/1,
finish/1, sslv2/1, sslv3/1, tlsv1/1, sslv2_sslv3/1,
sslv2_tlsv1/1, sslv3_tlsv1/1, sslv2_sslv3_tlsv1/1]).
-import(ssl_test_MACHINE, [mk_ssl_cert_opts/1, test_one_listener/7,
test_server_only/6]).
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
-include("ssl_test_MACHINE.hrl").
@@ -38,14 +38,19 @@ end_per_testcase(_Case, Config) ->
WatchDog = ?config(watchdog, Config),
test_server:timetrap_cancel(WatchDog).
-all(doc) ->
- "Test of configuration protocol_version.";
-all(suite) ->
- {conf,
- config,
- [sslv2, sslv3, tlsv1, sslv2_sslv3, sslv2_tlsv1, sslv3_tlsv1,
- sslv2_sslv3_tlsv1],
- finish}.
+all() ->
+[sslv2, sslv3, tlsv1, sslv2_sslv3, sslv2_tlsv1,
+ sslv3_tlsv1, sslv2_sslv3_tlsv1].
+
+groups() ->
+ [].
+
+init_per_group(_GroupName, Config) ->
+ Config.
+
+end_per_group(_GroupName, Config) ->
+ Config.
+
config(doc) ->
"Want to se what Config contains.";