diff options
| author | Siri Hansen <[email protected]> | 2013-01-25 11:33:57 +0100 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2013-01-25 15:56:01 +0100 |
| commit | 7a056d997ca002a99fec6d303b7077294c1d999b (patch) | |
| tree | 6744bb7b55bf20481f0b7092d0d725e9dcc9bdbe | |
| parent | b7777781864df9df281b521326db4210beaf9f6e (diff) | |
| download | otp-7a056d997ca002a99fec6d303b7077294c1d999b.tar.gz otp-7a056d997ca002a99fec6d303b7077294c1d999b.tar.bz2 otp-7a056d997ca002a99fec6d303b7077294c1d999b.zip | |
[test_server] Don't escape : and @ in test log links
If escaping :, then links of type "file:///c:/ldisk..." will not work.
Escaping @ does not create any problems, but the link becomes harder
to read and most modern browsers can handle this.
| -rw-r--r-- | lib/test_server/src/test_server_ctrl.erl | 7 | ||||
| -rw-r--r-- | lib/test_server/test/test_server_SUITE_data/test_server_unicode_SUITE.erl | 6 |
2 files changed, 7 insertions, 6 deletions
diff --git a/lib/test_server/src/test_server_ctrl.erl b/lib/test_server/src/test_server_ctrl.erl index b7e7926fd6..e5d75e43c9 100644 --- a/lib/test_server/src/test_server_ctrl.erl +++ b/lib/test_server/src/test_server_ctrl.erl @@ -5364,11 +5364,12 @@ do_uri_encode([Char|Chars]) -> do_uri_encode([]) -> []. -%% Copied from http_uri.erl +%% Copied from http_uri.erl, but slightly modified +%% (not converting @ and :) reserved() -> - sets:from_list([$;, $:, $@, $&, $=, $+, $,, $/, $?, + sets:from_list([$;, $&, $=, $+, $,, $/, $?, $#, $[, $], $<, $>, $\", ${, $}, $|, - $\\, $', $^, $%, $ ]). + $\\, $', $^, $%, $ ]). encoding(File) -> case epp:read_encoding(File) of diff --git a/lib/test_server/test/test_server_SUITE_data/test_server_unicode_SUITE.erl b/lib/test_server/test/test_server_SUITE_data/test_server_unicode_SUITE.erl index efdc626c24..662adedd4c 100644 --- a/lib/test_server/test/test_server_SUITE_data/test_server_unicode_SUITE.erl +++ b/lib/test_server/test/test_server_SUITE_data/test_server_unicode_SUITE.erl @@ -21,14 +21,14 @@ -export([all/1, init_per_suite/1, end_per_suite/1]). -export([init_per_testcase/2, end_per_testcase/2]). --export(['#difficult_case_name_äöå'/1, +-export([':#"|@\\ difficult_case_name_äöå'/1, print_and_log_unicode/1, print_and_log_latin1/1]). -include_lib("test_server/include/test_server.hrl"). all(suite) -> - ['#difficult_case_name_äöå', + [':#"|@\\ difficult_case_name_äöå', print_and_log_unicode, print_and_log_latin1]. @@ -57,7 +57,7 @@ cancel_timetrap(Config) -> %%%----------------------------------------------------------------- %%% Test cases -'#difficult_case_name_äöå'(Config) when is_list(Config) -> +':#"|@\\ difficult_case_name_äöå'(Config) when is_list(Config) -> ok. print_and_log_unicode(Config) when is_list(Config) -> |