diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2016-05-20 18:52:30 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2016-05-20 18:52:30 +0200 |
| commit | 3b5bfab5235cb045c4c24d076006ded3e5d1a423 (patch) | |
| tree | 8ea9c51c72d26807d4887f5c06aa3a686fb1874c /lib/xmerl/test/xmerl_xsd_SUITE.erl | |
| parent | 6d1458814b1d9b3030f4823461e22a2be8d3fc68 (diff) | |
| download | otp-3b5bfab5235cb045c4c24d076006ded3e5d1a423.tar.gz otp-3b5bfab5235cb045c4c24d076006ded3e5d1a423.tar.bz2 otp-3b5bfab5235cb045c4c24d076006ded3e5d1a423.zip | |
Modernize timetraps
Diffstat (limited to 'lib/xmerl/test/xmerl_xsd_SUITE.erl')
| -rw-r--r-- | lib/xmerl/test/xmerl_xsd_SUITE.erl | 26 |
1 files changed, 9 insertions, 17 deletions
diff --git a/lib/xmerl/test/xmerl_xsd_SUITE.erl b/lib/xmerl/test/xmerl_xsd_SUITE.erl index d0676809bd..cd3ecaa3bd 100644 --- a/lib/xmerl/test/xmerl_xsd_SUITE.erl +++ b/lib/xmerl/test/xmerl_xsd_SUITE.erl @@ -74,30 +74,22 @@ groups() -> {misc_block_tests, [], [compare_dateTime, compare_duration]}]. -init_per_group(_GroupName, Config) -> - Config. - -end_per_group(_GroupName, Config) -> - Config. +suite() -> + [{timetrap,{minutes,10}}]. init_per_testcase(_TestCase,Config) -> - {ok, _} = - file:read_file_info(filename:join([?config(priv_dir,Config)])), + {ok,_} = file:read_file_info(filename:join([?config(priv_dir,Config)])), code:add_patha(?config(priv_dir,Config)), - Dog=test_server:timetrap({minutes,10}), - [{watchdog, Dog}|Config]. + Config. -end_per_testcase(_Func,Config) -> - Dog=?config(watchdog, Config), - test_server:timetrap_cancel(Dog), +end_per_testcase(_Func,_Config) -> ok. string(suite) -> []; string(_Config) -> %% #x9 | #xA | #xD | [#x20-#xD7FF] | [#xE000-#xFFFD] | [#x10000-#x10FFFF] - Str = [16#9,16#A,16#D,16#20,16#D7FF,16#E000,16#FFFD,16#10000, - 16#10FFFF], + Str = [16#9,16#A,16#D,16#20,16#D7FF,16#E000,16#FFFD,16#10000, 16#10FFFF], {ok,_} = check_simpleType(string,Str,dummy). boolean(suite) -> []; @@ -1025,9 +1017,9 @@ ticket_6910(Config) -> ticket_7165(suite) -> []; ticket_7165(Config) -> %% The validation option seems not to work - {E,_} = xmerl_scan:file(filename:join([?config(data_dir,Config), - "ticket_7288.xml"]), - [{validation, schema}]), + {_E,_} = xmerl_scan:file(filename:join([?config(data_dir,Config), + "ticket_7288.xml"]), + [{validation, schema}]), %% The option xsdbase gave {error, enoent}. {ok,_} = xmerl_xsd:process_schema("CxDataType_Rel5.xsd", [{xsdbase, ?config(data_dir,Config)}]). |