diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2017-06-27 11:54:54 +0300 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2017-06-27 11:54:54 +0300 |
| commit | b1c86ad2896ba24df9ea69a5b0f68fc5124d80ae (patch) | |
| tree | ccbf378d6586fd986a3072a247c0295c064f7a7f | |
| parent | 5f2ef64a751ee18f4e3d4b115f0a4331e453b733 (diff) | |
| parent | 2e99c66d76be0fe77af51b66deb79e9ee347b208 (diff) | |
| download | rabbitmq-server-git-b1c86ad2896ba24df9ea69a5b0f68fc5124d80ae.tar.gz | |
Merge branch 'master' into rabbitmq-mqtt-139
| -rw-r--r-- | src/rabbit_reader.erl | 2 | ||||
| -rw-r--r-- | test/unit_inbroker_parallel_SUITE.erl | 20 |
2 files changed, 1 insertions, 21 deletions
diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl index 9f3445731b..e23d382d6e 100644 --- a/src/rabbit_reader.erl +++ b/src/rabbit_reader.erl @@ -249,7 +249,7 @@ server_properties(Protocol) -> [{product, Product}, {version, Version}, {cluster_name, rabbit_nodes:cluster_name()}, - {platform, "Erlang/OTP"}, + {platform, rabbit_misc:platform_and_version()}, {copyright, ?COPYRIGHT_MESSAGE}, {information, ?INFORMATION_MESSAGE}]]], diff --git a/test/unit_inbroker_parallel_SUITE.erl b/test/unit_inbroker_parallel_SUITE.erl index 9c274ab525..453f4b2e72 100644 --- a/test/unit_inbroker_parallel_SUITE.erl +++ b/test/unit_inbroker_parallel_SUITE.erl @@ -337,26 +337,6 @@ override_group_leader() -> {group_leader, Leader} = erlang:process_info(whereis(rabbit), group_leader), erlang:group_leader(Leader, self()). -empty_files(Files) -> - [case file:read_file_info(File) of - {ok, FInfo} -> FInfo#file_info.size == 0; - Error -> Error - end || File <- Files]. - -non_empty_files(Files) -> - [case EmptyFile of - {error, Reason} -> {error, Reason}; - _ -> not(EmptyFile) - end || EmptyFile <- empty_files(Files)]. - -test_logs_working(MainLogFile, SaslLogFile) -> - ok = rabbit_log:error("Log a test message~n"), - ok = error_logger:error_report(crash_report, [fake_crash_report, ?MODULE]), - %% give the error loggers some time to catch up - timer:sleep(100), - [true, true] = non_empty_files([MainLogFile, SaslLogFile]), - ok. - set_permissions(Path, Mode) -> case file:read_file_info(Path) of {ok, FInfo} -> file:write_file_info( |